Branch: refs/heads/develop
Home: https://github.com/cytoscape/cytoscape-impl
Commit: cb029e850b9d02a4eaac1a1f40073632c21dce6f
https://github.com/cytoscape/cytoscape-impl/commit/cb029e850b9d02a4eaac1a1f40073632c21dce6f
Author: dwelker <[email protected]>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
M json-impl/src/test/resources/site/app/data/vs1.json
M
swing-util-impl/src/main/java/org/cytoscape/util/swing/internal/FileUtilImpl.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportNetworkTableReaderFactory.java
Log Message:
-----------
fixes #2011 and fixes #2027. Now, when they user seeks to load a network
file, files of unknown type are assumed to be .txt.
Commit: 38d0d919ede8782ac44830b6735f4d4f05670d11
https://github.com/cytoscape/cytoscape-impl/commit/38d0d919ede8782ac44830b6735f4d4f05670d11
Author: dwelker <[email protected]>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ButtonDelegator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/TextAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseMotionListener.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
M
table-browser-impl/src/test/java/org/cytoscape/browser/internal/BrowserTableTest.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMainPanel.java
M
webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/PSICQUICRestClient.java
M
webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/mapper/CyNetworkBuilder.java
M
webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/mapper/InteractionClusterMapper.java
Log Message:
-----------
Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into develop
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/d26f890ccfd1...38d0d919ede8
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/groups/opt_out.
