Branch: refs/heads/develop
Home: https://github.com/cytoscape/cytoscape-impl
Commit: 2976747fb8f0115fc3de8c8e6a933603e9eecea3
https://github.com/cytoscape/cytoscape-impl/commit/2976747fb8f0115fc3de8c8e6a933603e9eecea3
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationManagerImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/DingAnnotation.java
Log Message:
-----------
Api for batch annotations, Refs #3966
Commit: 35de93b8a435d241fb69350f65591811889eba8f
https://github.com/cytoscape/cytoscape-impl/commit/35de93b8a435d241fb69350f65591811889eba8f
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2017-11-28 (Tue, 28 Nov 2017)
Changed paths:
M app-impl/pom.xml
M app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
A app-impl/src/main/java/org/cytoscape/app/internal/action/YFilesAction.java
M application-impl/pom.xml
M
application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
M command-executor-impl/pom.xml
M
command-executor-impl/src/main/java/org/cytoscape/command/internal/StringToModelImpl.java
M
command-executor-impl/src/main/java/org/cytoscape/command/internal/available/dummies/DummyTable.java
A core-task-impl/hs_err_pid3236.log
A core-task-impl/hs_err_pid44250.log
M core-task-impl/pom.xml
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkWriter.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/GenerateNetworkViewsTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/LoadNetworkFileTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/LoadNetworkURLTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportTableTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/NoGuiSelectExportTableTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/AbstractGroupTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/AddToGroupTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/CollapseGroupTask.java
A
core-task-impl/src/main/java/org/cytoscape/task/internal/group/GetGroupTask.java
A
core-task-impl/src/main/java/org/cytoscape/task/internal/group/GetGroupTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/ListGroupsTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/RemoveFromGroupTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/RenameGroupTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/group/UnGroupNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideCommandTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideCommandTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/layout/GetPreferredLayoutTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/layout/SetPreferredLayoutTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/AbstractNetworkFromSelectionTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/CloneNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/CloneNetworkTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/DestroyNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/NewEmptyNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/NewEmptyNetworkTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/network/NewNetworkCommandTask.java
A
core-task-impl/src/main/java/org/cytoscape/task/internal/network/RegisterNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/AddEdgeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/AddNodeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/AddNodeTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/AddTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/AddTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/GetEdgeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/GetNetworkPropertiesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/GetNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/GetNetworkTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/GetNodeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/ListEdgesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/ListNetworksTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/ListNetworksTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/ListNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/ListPropertiesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/SetCurrentNetworkTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/SetNetworkPropertiesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/select/DeselectTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/select/DeselectTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectTaskFactory.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/AddRowTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/CreateColumnTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/CreateNetworkAttributeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/CreateTableTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnCommandTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteRowTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/DestroyTableTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/GetColumnTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/GetNetworkAttributeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/GetRowTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/GetValueTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/ImportTableDataTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/ListColumnsTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/ListRowsTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/ListTablesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/MergeTablesTask.java
A
core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnCommandTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/SetNetworkAttributeTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/SetTableTitleTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/table/SetValuesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/utils/ColumnTunable.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/utils/DataUtils.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/utils/NodeAndEdgeTunable.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/utils/RowTunable.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/utils/TableTunable.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/CreateNetworkViewTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/CreateNetworkViewTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/DestroyNetworkViewTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/GetCurrentNetworkViewTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/ListNetworkViewsTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/SetCurrentNetworkViewTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/view/UpdateNetworkViewTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ExportVizmapTaskFactoryImpl.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/network/CloneNetworkTaskFactoryTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/network/NewEmptyNetworkTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/select/DeselectAllTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectConnectedNodesTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/table/JoinTablesTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/table/MergeDataTableTaskTest.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/view/CreateNetworkViewTaskTest.java
M datasource-impl/pom.xml
M ding-impl/ding-presentation-impl/pom.xml
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
M ding-impl/performance-debug/pom.xml
M ding-impl/pom.xml
M edge-bundler-impl/pom.xml
M editor-impl/pom.xml
M equations-functions-impl/pom.xml
M equations-impl/pom.xml
M event-impl/impl/pom.xml
M event-impl/it/pom.xml
M event-impl/pom.xml
M filter-impl/pom.xml
M filter2-impl/pom.xml
M
filter2-impl/src/main/java/org/cytoscape/filter/internal/filters/column/ColumnFilter.java
M graphml-impl/pom.xml
R
graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/util/GraphMLDragAndDropManager.java
M group-impl/pom.xml
M group-impl/src/main/java/org/cytoscape/group/internal/CyActivator.java
M gui-cmdline-parser-impl/pom.xml
M headless-application-impl/pom.xml
M headless-cmdline-parser-impl/pom.xml
M io-impl/impl/pom.xml
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/util/StreamUtilImpl.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/write/graphics/BitmapWriter.java
M io-impl/performance/pom.xml
M io-impl/pom.xml
M jobs-impl/pom.xml
M jobs-impl/src/main/java/org/cytoscape/jobs/internal/CyActivator.java
M layout-cytoscape-impl/pom.xml
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/GroupAttributesLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/StackedNodeLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/circularLayout/CircularLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/cose/CoSELayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/graphPartition/AttributeCircleLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/graphPartition/DegreeSortedCircleContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/graphPartition/ISOMLayoutContext.java
M
layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/hierarchicalLayout/HierarchicalLayoutContext.java
M layout-impl/pom.xml
M
layout-impl/src/main/java/org/cytoscape/view/layout/internal/CyLayoutAlgorithmManagerImpl.java
M
layout-impl/src/main/java/org/cytoscape/view/layout/internal/algorithms/GridNodeLayoutContext.java
M
layout-impl/src/main/java/org/cytoscape/view/layout/internal/task/LayoutTaskFactoryWrapper.java
M
layout-impl/src/main/java/org/cytoscape/view/layout/internal/task/LayoutWrapperTask.java
M layout-jgraph-impl/pom.xml
M layout-prefuse-impl/pom.xml
M
layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutContext.java
M linkout-impl/pom.xml
M linkout-impl/src/main/resources/linkout.props
M log-swing-impl/pom.xml
M manual-layout-impl/pom.xml
M model-impl/impl/pom.xml
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/CyActivator.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableFactoryImpl.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/VirtualColumn.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/CanonicalStringPool.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/CanonicalStringPoolFilter.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/ColumnData.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/ColumnDataFactory.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/ColumnDataFactoryFastUtil.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/ColumnDataFactoryHashMap.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/ColumnDataFactoryHashMapWithStringPool.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/EquationSupport.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/LongToBooleanColumn.java
A
model-impl/impl/src/main/java/org/cytoscape/model/internal/column/MapColumn.java
M model-impl/impl/src/test/java/org/cytoscape/model/CyColumnTest.java
M model-impl/impl/src/test/java/org/cytoscape/model/CyTableManagerTest.java
M model-impl/impl/src/test/java/org/cytoscape/model/CyTableTest.java
M model-impl/it/pom.xml
M model-impl/performance-debug/pom.xml
M model-impl/performance/pom.xml
M model-impl/pom.xml
M model-impl/table-performance-debug/pom.xml
M pom.xml
M presentation-impl/pom.xml
M property-impl/pom.xml
M property-impl/src/main/resources/cytoscape3.props
M scripting-impl/pom.xml
M search-impl/pom.xml
M
search-impl/src/main/java/org/cytoscape/search/internal/EnhancedSearchPlugin.java
M session-impl/impl/pom.xml
M session-impl/integration-test/pom.xml
M session-impl/pom.xml
M swing-application-impl/pom.xml
M
swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/SessionHandler.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/util/ViewUtil.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewMainPanel.java
M swing-util-impl/pom.xml
M table-browser-impl/pom.xml
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/BrowserTable.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/PopupMenuHelper.java
M
table-browser-impl/src/test/java/org/cytoscape/browser/internal/view/BrowserTableTest.java
M table-import-impl/pom.xml
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/ImportNoGuiNetworkReaderFactory.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/ImportOntologyAndAnnotationAction.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/LoadNetworkReaderTask.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/LoadTableReaderTask.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/NetworkCollectionHelper.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/SelectFileTableTask.java
M
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/task/SelectURLTableTask.java
M viewmodel-impl/impl/pom.xml
M viewmodel-impl/it/pom.xml
M viewmodel-impl/pom.xml
M vizmap-gui-core-impl/pom.xml
M vizmap-gui-impl/pom.xml
M vizmap-impl/impl/pom.xml
M vizmap-impl/it/pom.xml
M vizmap-impl/pom.xml
M webservice-impl/pom.xml
M work-headless-impl/pom.xml
M work-impl/pom.xml
M work-swing-impl/impl/pom.xml
M work-swing-impl/it/pom.xml
M work-swing-impl/pom.xml
Log Message:
-----------
Merge branch 'develop' into feature/batch_annotations
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/859ba1532f83...35de93b8a435
--
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 cytoscape-cvs+unsubscr...@googlegroups.com.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
Visit this group at https://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.
