Author: mes
Date: 2010-11-23 17:43:37 -0800 (Tue, 23 Nov 2010)
New Revision: 23002
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/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/properties/PropertiesFileFilter.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
Log:
fixed accept to accepts renaming problem
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-11-24 01:11:13 UTC (rev 23001)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-11-24 01:43:37 UTC (rev 23002)
@@ -63,12 +63,13 @@
*/
public R getReader(URI uri) {
for (T factory : factories) {
- logger.info("trying factory: " + factory);
CyFileFilter cff = factory.getCyFileFilter();
+ logger.debug("trying factory: " + factory + " with
filter: " + cff);
if (cff.accepts(uri, category) && uri != null ) {
try {
+ logger.debug("successfully matched
factory " + factory);
factory.setInputStream(
uri.toURL().openStream() );
return
(R)factory.getTaskIterator().next();
} catch (IOException e) {
@@ -89,11 +90,13 @@
for (T factory : factories) {
CyFileFilter cff = factory.getCyFileFilter();
+ logger.debug("trying factory: " + factory + "
with filter: " + cff);
// 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.accepts(CopyInputStream.copyKBytes(stream,2), category)) {
+ logger.debug("successfully matched
factory " + factory);
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-11-24 01:11:13 UTC (rev 23001)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/bookmarks/BookmarkFileFilter.java
2010-11-24 01:43:37 UTC (rev 23002)
@@ -13,12 +13,15 @@
public class BookmarkFileFilter extends CyFileFilterImpl {
+ private static final Logger logger =
LoggerFactory.getLogger(BookmarkFileFilter.class);
+
public BookmarkFileFilter(Set<String> extensions, Set<String>
contentTypes,
String description, DataCategory category, StreamUtil
streamUtil) {
super(extensions, contentTypes, description, category,
streamUtil);
}
- public boolean accept(InputStream stream, DataCategory category) {
+ @Override
+ public boolean accepts(InputStream stream, DataCategory category) {
// Check data category
if (category != this.category)
@@ -34,9 +37,8 @@
@Override
public boolean accepts(URI uri, DataCategory category) {
try {
- return accept(uri.toURL().openStream(), category);
+ return accepts(uri.toURL().openStream(), category);
} catch (IOException e) {
- Logger logger = LoggerFactory.getLogger(getClass());
logger.error("Error while opening stream: " + uri, e);
return false;
}
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-11-24 01:11:13 UTC (rev 23001)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/cysession/CysessionFileFilter.java
2010-11-24 01:43:37 UTC (rev 23002)
@@ -12,16 +12,18 @@
import org.slf4j.LoggerFactory;
public class CysessionFileFilter extends CyFileFilterImpl {
+
+ private static final Logger logger =
LoggerFactory.getLogger(CysessionFileFilter.class);
public CysessionFileFilter(Set<String> extensions, Set<String>
contentTypes,
String description, DataCategory category, StreamUtil
streamUtil) {
super(extensions, contentTypes, description, category,
streamUtil);
}
- public boolean accept(InputStream stream, DataCategory category) {
+ @Override
+ public boolean accepts(InputStream stream, DataCategory category) {
- // Check data category
- if (category != this.category)
+ if (category != this.category)
return false;
final String header = this.getHeader(stream,20);
@@ -34,9 +36,8 @@
@Override
public boolean accepts(URI uri, DataCategory category) {
try {
- return accept(uri.toURL().openStream(), category);
+ return accepts(uri.toURL().openStream(), category);
} catch (IOException e) {
- Logger logger = LoggerFactory.getLogger(getClass());
logger.error("Error while opening stream: " + uri, e);
return false;
}
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/properties/PropertiesFileFilter.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/properties/PropertiesFileFilter.java
2010-11-24 01:11:13 UTC (rev 23001)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/properties/PropertiesFileFilter.java
2010-11-24 01:43:37 UTC (rev 23002)
@@ -23,7 +23,8 @@
matcher = p.matcher("");
}
- public boolean accept(InputStream stream, DataCategory category) {
+ @Override
+ public boolean accepts(InputStream stream, DataCategory category) {
// Check data category
if (category != this.category)
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-11-24 01:11:13 UTC (rev 23001)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
2010-11-24 01:43:37 UTC (rev 23002)
@@ -14,6 +14,7 @@
public class XGMMLFileFilter extends CyFileFilterImpl {
private static final String XGMML_NAMESPACE_STRING =
"http://www.cs.rpi.edu/XGMML";;
+ private static final Logger logger =
LoggerFactory.getLogger(XGMMLFileFilter.class);
public XGMMLFileFilter(Set<String> extensions, Set<String> contentTypes,
@@ -21,7 +22,8 @@
super(extensions, contentTypes, description, category,
streamUtil);
}
- public boolean accept(InputStream stream, DataCategory category) {
+ @Override
+ public boolean accepts(InputStream stream, DataCategory category) {
// Check data category
if (category != this.category)
@@ -37,9 +39,8 @@
@Override
public boolean accepts(URI uri, DataCategory category) {
try {
- return accept(uri.toURL().openStream(), category);
+ return accepts(uri.toURL().openStream(), category);
} catch (IOException e) {
- Logger logger = LoggerFactory.getLogger(getClass());
logger.error("Error while opening stream: " + uri, e);
return false;
}
--
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.
