Branch: refs/heads/feature/json-support
Home: https://github.com/cytoscape/cytoscape-impl
Commit: 090274ba08d99dfeda32c57ac32fe35b40c770ac
https://github.com/cytoscape/cytoscape-impl/commit/090274ba08d99dfeda32c57ac32fe35b40c770ac
Author: Samad Lotia <[email protected]>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
M app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
Log Message:
-----------
Added citation field for WebApp
Commit: 62d883ad23f7a1fe0c77c0e912765db9d7d0ab5e
https://github.com/cytoscape/cytoscape-impl/commit/62d883ad23f7a1fe0c77c0e912765db9d7d0ab5e
Author: Christian Lopes <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheet.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMainPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMediator.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Refs #1969: Minor cosmetic improvements (Visual Style selector and Discrete
Value Editor colours, VizMapper's property sheet panel width)
Commit: aae0a984ddaabf9f65a31af1cd8d17213121fd47
https://github.com/cytoscape/cytoscape-impl/commit/aae0a984ddaabf9f65a31af1cd8d17213121fd47
Author: Samad Lotia <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
M app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
Log Message:
-----------
Added citation field for WebApp
Commit: 36dde33fbc1b44124ae5fe8fd030cd3d71e013c6
https://github.com/cytoscape/cytoscape-impl/commit/36dde33fbc1b44124ae5fe8fd030cd3d71e013c6
Author: Samad Lotia <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
A
app-impl/src/main/java/org/cytoscape/app/internal/action/CitationsAction.java
A app-impl/src/main/java/org/cytoscape/app/internal/ui/CitationsDialog.java
Log Message:
-----------
Added citations dialog
Commit: 9b27741e29df69ecd54a7db186b89b6e4015a12f
https://github.com/cytoscape/cytoscape-impl/commit/9b27741e29df69ecd54a7db186b89b6e4015a12f
Author: Samad Lotia <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M biopax-impl/pom.xml
M biopax-impl/src/main/java/org/cytoscape/biopax/internal/BioPaxFilter.java
M biopax-impl/src/main/java/org/cytoscape/biopax/internal/BioPaxMapper.java
A biopax-impl/src/main/java/org/cytoscape/biopax/internal/BioPaxReader.java
M
biopax-impl/src/main/java/org/cytoscape/biopax/internal/BioPaxReaderTask.java
R
biopax-impl/src/main/java/org/cytoscape/biopax/internal/BioPaxReaderTaskFactory.java
M biopax-impl/src/main/java/org/cytoscape/biopax/internal/CyActivator.java
A
biopax-impl/src/main/java/org/cytoscape/biopax/internal/util/ClassLoaderHack.java
M
biopax-impl/src/main/java/org/cytoscape/biopax/internal/util/ExternalLinkUtil.java
R biopax-impl/src/main/java/org/cytoscape/biopax/internal/util/StaxHack.java
M
biopax-impl/src/main/java/org/cytoscape/biopax/internal/util/VisualStyleUtil.java
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
M editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
M
model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheet.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMainPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMediator.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Merge branch 'develop' of https://github.com/cytoscape/cytoscape-impl into
develop
Commit: ccc5a101ec95f096e10b7991bf69c060993beda5
https://github.com/cytoscape/cytoscape-impl/commit/ccc5a101ec95f096e10b7991bf69c060993beda5
Author: Scooter Morris <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ArrowAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ArrowAnnotationPanel.java
Log Message:
-----------
Add support for anchor type
Change-Id: I834e746bed57005724c339db88c5fb126eb320dd
Commit: 1caf17e84362bd456bfc346613947cf68a13183e
https://github.com/cytoscape/cytoscape-impl/commit/1caf17e84362bd456bfc346613947cf68a13183e
Author: Scooter Morris <[email protected]>
Date: 2013-09-15 (Sun, 15 Sep 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/CyActivator.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
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseListener.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseMotionListener.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTaskFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTaskFactory.java
Log Message:
-----------
Initial implementation of group annotations.
Change-Id: Id343af6a6279cb52d94ab5968df9e2d28a79468c
Commit: 6d2482ba56630489ce832b213e2eafbcc5ab40ee
https://github.com/cytoscape/cytoscape-impl/commit/6d2482ba56630489ce832b213e2eafbcc5ab40ee
Author: Christian Lopes <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M
core-task-impl/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/task/OpenRecentSessionTaskFactory.java
Log Message:
-----------
Refs #1251: The confirmation dialog is now showed before the new session is
read.
Commit: 4744f8f9c6e72f18ba91f2dcd9c3c35cc58fec72
https://github.com/cytoscape/cytoscape-impl/commit/4744f8f9c6e72f18ba91f2dcd9c3c35cc58fec72
Author: Scooter Morris <[email protected]>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationFactoryManager.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/GroupAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/TextAnnotationImpl.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/create/GroupAnnotationFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseListener.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTask.java
Log Message:
-----------
Rest of changes for group annotations.
Change-Id: I467c40e4db11c5a7ed6fe259a6b68df727a55b9a
Commit: b2f4d935e83092179f0dd6d25a443b3721322592
https://github.com/cytoscape/cytoscape-impl/commit/b2f4d935e83092179f0dd6d25a443b3721322592
Author: Christian Lopes <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheet.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheetItem.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMainPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMediator.java
Log Message:
-----------
Refs #1969: Usability improvements (Visual Property Sheet Item visible by
default when it has a mapping; proper multiple selection on the property sheet)
Commit: adf927260ffa4393e42f7c61a533c6d8fb0b96f8
https://github.com/cytoscape/cytoscape-impl/commit/adf927260ffa4393e42f7c61a533c6d8fb0b96f8
Author: Samad Lotia <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M app-impl/src/main/java/org/cytoscape/app/internal/ui/CitationsDialog.java
Log Message:
-----------
Added app names with citations; added Cytoscape citation
Commit: b5d1895ef28cd88d4ff288a1e59bf186debf7fe3
https://github.com/cytoscape/cytoscape-impl/commit/b5d1895ef28cd88d4ff288a1e59bf186debf7fe3
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
A
app-impl/src/main/java/org/cytoscape/app/internal/action/CitationsAction.java
M app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
M app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
A app-impl/src/main/java/org/cytoscape/app/internal/ui/CitationsDialog.java
M app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
M
core-task-impl/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationFactoryManager.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/ArrowAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/DingAnnotation.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/TextAnnotationImpl.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/create/GroupAnnotationFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ArrowAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ArrowAnnotationPanel.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseListener.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseMotionListener.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTaskFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTask.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTaskFactory.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/task/OpenRecentSessionTaskFactory.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheet.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheetItem.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMainPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMediator.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Merge branch 'develop' into feature/json-support
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/99fed3ff4f8e...b5d1895ef28c
--
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.
