Branch: refs/heads/feature/json-support
Home: https://github.com/cytoscape/cytoscape-impl
Commit: b6831f7cd7853787093331f2a6c9714c06f78dc1
https://github.com/cytoscape/cytoscape-impl/commit/b6831f7cd7853787093331f2a6c9714c06f78dc1
Author: Samad Lotia <[email protected]>
Date: 2013-08-30 (Fri, 30 Aug 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java
Log Message:
-----------
Created new dialog for inputting numbers
Commit: f11b98f2144452b0c8f9645a0f5c03ad991aee51
https://github.com/cytoscape/cytoscape-impl/commit/f11b98f2144452b0c8f9645a0f5c03ad991aee51
Author: Samad Lotia <[email protected]>
Date: 2013-08-30 (Fri, 30 Aug 2013)
Changed paths:
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
Log Message:
-----------
Merge branch 'develop' of https://github.com/cytoscape/cytoscape-impl into
develop
Commit: b790f6a512efb5c627e399a69c71b24706a5b29b
https://github.com/cytoscape/cytoscape-impl/commit/b790f6a512efb5c627e399a69c71b24706a5b29b
Author: Scooter Morris <[email protected]>
Date: 2013-09-01 (Sun, 01 Sep 2013)
Changed paths:
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
Log Message:
-----------
Use the right property object!
Change-Id: Ibb3255753b34187258447ee6ca284fd46cac2a77
Commit: 0c5271ce8a0d9220ca0b2a79eed01e0520a57a54
https://github.com/cytoscape/cytoscape-impl/commit/0c5271ce8a0d9220ca0b2a79eed01e0520a57a54
Author: Christian Lopes <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/ObjectPositionIcon.java
Log Message:
-----------
Refs #1969: Fixed icons for Custom Graphics, Object Position and Edge Bend on
the Continuous-to-Discrete Mapping Editor. Also fixed Edge Bend Icon so the
number (of control points) is not cropped.
Commit: 87e20b37e00f2023e1ab98424442a20857f7b8b4
https://github.com/cytoscape/cytoscape-impl/commit/87e20b37e00f2023e1ab98424442a20857f7b8b4
Author: Christian Lopes <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/C2DMappingEditorPanel.java
Log Message:
-----------
Fixes #2047: The C2D Mapping Editor now gets the Rendering Engine from
DefaultViewPanel rather than CyApplicationManager.
Commit: 9a5dfe03653f23b21c0ef29850bcf0db37821de7
https://github.com/cytoscape/cytoscape-impl/commit/9a5dfe03653f23b21c0ef29850bcf0db37821de7
Author: Christian Lopes <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Refs #1969: Fixed bug that prevented the icons on the Discrete Value Editor
from being displayed when there was no current Network View.
Commit: 472e698e303b09673e3a221bfa78147dddd9dce8
https://github.com/cytoscape/cytoscape-impl/commit/472e698e303b09673e3a221bfa78147dddd9dce8
Author: Christian Lopes <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java
Log Message:
-----------
Refs #1969: Fixed minor bug that positioned the Numeric Value Editor dialog
in the upper-left corner of the screen.
Commit: e4d6baa5aa115edb090c47150e18dae80c61bd2c
https://github.com/cytoscape/cytoscape-impl/commit/e4d6baa5aa115edb090c47150e18dae80c61bd2c
Author: Samad Lotia <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java
Log Message:
-----------
Finalized updates to NumericValueEditor's dialog
Commit: aa1569d0ffc37dfd816e871a07bc58b84a4ade31
https://github.com/cytoscape/cytoscape-impl/commit/aa1569d0ffc37dfd816e871a07bc58b84a4ade31
Author: Samad Lotia <[email protected]>
Date: 2013-09-03 (Tue, 03 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/icon/CustomGraphicsIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/ObjectPositionIcon.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/C2DMappingEditorPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Using last commit's version of NumericValueEditor
Commit: 81f3fbdef2b15cbf8f5c8d5bddcbf0884ac5748a
https://github.com/cytoscape/cytoscape-impl/commit/81f3fbdef2b15cbf8f5c8d5bddcbf0884ac5748a
Author: Samad Lotia <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
Log Message:
-----------
Auto mode in table browser does not cause selection in network
Commit: 0eb613baaeccc09ad0b5f7d71e463e4d99435bf9
https://github.com/cytoscape/cytoscape-impl/commit/0eb613baaeccc09ad0b5f7d71e463e4d99435bf9
Author: Samad Lotia <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapPropertyBuilder.java
Log Message:
-----------
Added support for VisualPropertyEditor2
Commit: 45f355daf6f7b6ea6215ee2a495f210d2cd3fcdb
https://github.com/cytoscape/cytoscape-impl/commit/45f355daf6f7b6ea6215ee2a495f210d2cd3fcdb
Author: Samad Lotia <[email protected]>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/NumberVisualPropertyEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/propertyeditor/CyNumberPropertyEditor.java
Log Message:
-----------
Added NumericPropertyEditor's support for VisualPropertyEditor2--now
correctly verifies if the inputted number is in range
Commit: 4810c2f29dc2e375765e61ffe36c47fa515fcae7
https://github.com/cytoscape/cytoscape-impl/commit/4810c2f29dc2e375765e61ffe36c47fa515fcae7
Author: Samad Lotia <[email protected]>
Date: 2013-09-04 (Wed, 04 Sep 2013)
Changed paths:
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
Log Message:
-----------
Fixed NPE in GlobalTableBrowser's handling of RowSetEvent
Commit: 5c70ef191f59fb85e1c571f26db96663cd72aa34
https://github.com/cytoscape/cytoscape-impl/commit/5c70ef191f59fb85e1c571f26db96663cd72aa34
Author: Christian Lopes <[email protected]>
Date: 2013-09-05 (Thu, 05 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
Log Message:
-----------
Refs #1969: Renamed tab title to "Style". Renamed "Remove/Add" Visual
Properties (menu items) to "Hide/Show".
Commit: 9c5028011910f19ef4707834066963abd0dc9605
https://github.com/cytoscape/cytoscape-impl/commit/9c5028011910f19ef4707834066963abd0dc9605
Author: Christian Lopes <[email protected]>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M
filter-impl/src/main/java/org/cytoscape/filter/internal/gui/FilterCytoPanelComponent.java
Log Message:
-----------
Renamed "Filters" tab to "Filter".
Commit: 792f4f24a8f0c55666ec7ee55437ab4ed7776baf
https://github.com/cytoscape/cytoscape-impl/commit/792f4f24a8f0c55666ec7ee55437ab4ed7776baf
Author: Christian Lopes <[email protected]>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/DiscreteTrackRenderer.java
Log Message:
-----------
Refs #1969: Fixed bug that prevented the first value icon from being
displayed on the C2D Mapping Renderer.
Commit: b2d5c1c7dad19658e893dc7369ca4fa4195fa78b
https://github.com/cytoscape/cytoscape-impl/commit/b2d5c1c7dad19658e893dc7369ca4fa4195fa78b
Author: Christian Lopes <[email protected]>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/DiscreteTrackRenderer.java
Log Message:
-----------
Refs #1969: Code reformat only.
Commit: 00f44bae32b2c8c6fbf7ed7bf5ceb31b69b6ba43
https://github.com/cytoscape/cytoscape-impl/commit/00f44bae32b2c8c6fbf7ed7bf5ceb31b69b6ba43
Author: Christian Lopes <[email protected]>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/NumberConverter.java
A
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyUtil.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/editor/propertyeditor/CyDiscreteValuePropertyEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
Log Message:
-----------
Refs #1969: Adds undo support for setting a new visual mapping and a discrete
value. Now showing the current value on the Discrete Value Editor. Fixes bug
that would add a PropertyChangeListener to the same PropertyEditors multiple
times.
Commit: 04e99db29a011b18b16c0ac85478bfde117aa21b
https://github.com/cytoscape/cytoscape-impl/commit/04e99db29a011b18b16c0ac85478bfde117aa21b
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
R
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
Log Message:
-----------
AbstractCyNetworkReader has been moved from io-impl.
Commit: 8b85b442e9ee12f8d2a11f4a0784f7541a9f472f
https://github.com/cytoscape/cytoscape-impl/commit/8b85b442e9ee12f8d2a11f4a0784f7541a9f472f
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/nnf/NNFNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
Log Message:
-----------
AbstractCyNetworkReader has been moved from io-impl.
Commit: a1a9e2f379e005fac48b31b9b2bd2bb87de4812c
https://github.com/cytoscape/cytoscape-impl/commit/a1a9e2f379e005fac48b31b9b2bd2bb87de4812c
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-12 (Thu, 12 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/icon/CustomGraphicsIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/ObjectPositionIcon.java
M
filter-impl/src/main/java/org/cytoscape/filter/internal/gui/FilterCytoPanelComponent.java
R
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/nnf/NNFNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.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/GlobalTableBrowser.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/NumberConverter.java
A
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/VisualPropertyUtil.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/VizMapPropertyBuilder.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/editor/NumberVisualPropertyEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/C2DMappingEditorPanel.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/mappingeditor/DiscreteTrackRenderer.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/propertyeditor/CyDiscreteValuePropertyEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/propertyeditor/CyNumberPropertyEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/DiscreteValueEditor.java
M
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java
Log Message:
-----------
Merge branch 'develop' into feature/json-support
Commit: 19e0eebdef0397ce7684fe9f978be6595d71512f
https://github.com/cytoscape/cytoscape-impl/commit/19e0eebdef0397ce7684fe9f978be6595d71512f
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReaderFactory.java
A json-impl/jsStyle.json
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/AbstractReaderFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReader.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReaderFactory.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
R
json-impl/src/main/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReader.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriter.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriterFactory.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CyJacksonModule.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CyJsonToken.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsStyleConverter.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsToken.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/D3CyNetworkViewSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkViewSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVisualStyleSerializer.java
M
json-impl/src/test/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReaderTest.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JSONNetworkViewWriterTest.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JsVisualStyleSerializerTest.java
Log Message:
-----------
Start adding tag to visual property converter. (Not working yet).
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/4f8f37ed0150...19e0eebdef03
--
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.
