Author: kono
Date: 2011-06-03 19:40:08 -0700 (Fri, 03 Jun 2011)
New Revision: 25643
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReader.java
Log:
Integration to GUI had been started (OBO/GA Readers).
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2011-06-04 02:39:50 UTC (rev 25642)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2011-06-04 02:40:08 UTC (rev 25643)
@@ -33,12 +33,10 @@
if (importTablePanel == null) {
try {
- this.importTablePanel = new ImportTablePanel(
-
ImportTablePanel.SIMPLE_ATTRIBUTE_IMPORT, is,
- this.fileType);
+ this.importTablePanel =
+ new
ImportTablePanel(ImportTablePanel.SIMPLE_ATTRIBUTE_IMPORT, is, fileType, null,
null, null, null, null);
} catch (Exception e) {
- throw new IllegalStateException(
- "Could not initialize
ImportTablePanel.", e);
+ throw new IllegalStateException("Could not
initialize ImportTablePanel.", e);
}
}
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReader.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReader.java
2011-06-04 02:39:50 UTC (rev 25642)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReader.java
2011-06-04 02:40:08 UTC (rev 25643)
@@ -116,8 +116,9 @@
networks[0] = this.ontologyDAG;
+ logger.debug("Number of terms loaded = " +
this.termID2nodeMap.size());
termID2nodeMap.clear();
- logger.debug("Number of terms loaded = " +
this.termID2nodeMap.size());
+
}
private void parseHeader(final String line) {
@@ -192,7 +193,7 @@
termNode = this.ontologyDAG.addNode();
termNode.getCyRow().set(CyTableEntry.NAME, val);
termID2nodeMap.put(val, termNode);
- id = val;
+ id = val;
}
} else if (key.equals(NAME.toString())) {
// Name column is used in Cytoscape core, so
use different tag instead.
--
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.
