Branch: refs/heads/develop
Home: https://github.com/cytoscape/cytoscape-impl
Commit: 9eb692c38472b710b2e04a33a726fd1f83a8d7d5
https://github.com/cytoscape/cytoscape-impl/commit/9eb692c38472b710b2e04a33a726fd1f83a8d7d5
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
A json-impl/README.md
A json-impl/pom.xml
A json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReader.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/EncodingUtil.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONNetworkViewWriter.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONNetworkWriter.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONNetworkWriterFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriter.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriterFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CyJacksonModule.java
A
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/CytoscapeJsToken.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapejsModule.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/D3CyNetworkViewSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/D3CyNetworkViewTreeSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/D3TreeModule.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/D3jsModule.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkViewSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsNodeViewSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsRowSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVisualStyleSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVsiaulStyleSetSerializer.java
A
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JSONNetworkViewWriterTest.java
M pom.xml
Log Message:
-----------
json-impl has been added to the core.
Commit: 303e2ce13dd045bb9bb5f33d1724616e30df219b
https://github.com/cytoscape/cytoscape-impl/commit/303e2ce13dd045bb9bb5f33d1724616e30df219b
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/pom.xml
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsFileFilter.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReader.java
A
json-impl/src/main/java/org/cytoscape/io/internal/read/json/JSONMapper.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/DiscreteMappingSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVisualStyleSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/PassthroughMappingSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/VisualMappingSerializer.java
A
json-impl/src/test/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReaderTest.java
A
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JsVisualStyleSerializerTest.java
A json-impl/src/test/resources/site/.bowerrc
A json-impl/src/test/resources/site/.editorconfig
A json-impl/src/test/resources/site/.gitattributes
A json-impl/src/test/resources/site/.gitignore
A json-impl/src/test/resources/site/.jshintrc
A json-impl/src/test/resources/site/Gruntfile.js
A json-impl/src/test/resources/site/app/.htaccess
A json-impl/src/test/resources/site/app/404.html
A json-impl/src/test/resources/site/app/data/cyjs.json
A json-impl/src/test/resources/site/app/favicon.ico
A
json-impl/src/test/resources/site/app/images/glyphicons-halflings-white.png
A json-impl/src/test/resources/site/app/images/glyphicons-halflings.png
A json-impl/src/test/resources/site/app/index.html
A json-impl/src/test/resources/site/app/robots.txt
A json-impl/src/test/resources/site/app/scripts/hello.coffee
A json-impl/src/test/resources/site/app/scripts/main.js
A json-impl/src/test/resources/site/app/styles/main.scss
A json-impl/src/test/resources/site/bower.json
A json-impl/src/test/resources/site/package.json
A json-impl/src/test/resources/site/test/index.html
A json-impl/src/test/resources/site/test/lib/chai.js
A json-impl/src/test/resources/site/test/lib/expect.js
A json-impl/src/test/resources/site/test/lib/mocha/mocha.css
A json-impl/src/test/resources/site/test/lib/mocha/mocha.js
A json-impl/src/test/resources/site/test/spec/test.js
A json-impl/src/test/resources/testData/cyjs.json
Log Message:
-----------
Test web site generator had been added.
Commit: 920d5386065dfc98269db30d466d49e77bfe7361
https://github.com/cytoscape/cytoscape-impl/commit/920d5386065dfc98269db30d466d49e77bfe7361
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ContinuousMappingSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/DiscreteMappingSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVisualStyleSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/PassthroughMappingSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/VisualMappingSerializer.java
A json-impl/src/test/resources/site/.idea/.name
A json-impl/src/test/resources/site/.idea/encodings.xml
A json-impl/src/test/resources/site/.idea/misc.xml
A json-impl/src/test/resources/site/.idea/modules.xml
A json-impl/src/test/resources/site/.idea/scopes/scope_settings.xml
A json-impl/src/test/resources/site/.idea/site.iml
A json-impl/src/test/resources/site/.idea/vcs.xml
A json-impl/src/test/resources/site/.idea/workspace.xml
M json-impl/src/test/resources/site/Gruntfile.js
M json-impl/src/test/resources/site/app/scripts/main.js
M json-impl/src/test/resources/site/app/styles/main.scss
Log Message:
-----------
Start adding mapping serializers.
Commit: 6ff5c9524d593b54d5c8cbdd9e7c56fc62009061
https://github.com/cytoscape/cytoscape-impl/commit/6ff5c9524d593b54d5c8cbdd9e7c56fc62009061
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/pom.xml
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/PassthroughMappingSerializer.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JsVisualStyleSerializerTest.java
M json-impl/src/test/resources/site/.idea/workspace.xml
M json-impl/src/test/resources/site/app/index.html
M json-impl/src/test/resources/site/app/scripts/main.js
M json-impl/src/test/resources/site/app/styles/main.scss
Log Message:
-----------
Just started to add test cases for Visual Style Serializer. Still needs a
lot of actual test cases.
Commit: af2f9e907c88eaf196f26b47465d8c1e5e9dcc01
https://github.com/cytoscape/cytoscape-impl/commit/af2f9e907c88eaf196f26b47465d8c1e5e9dcc01
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M .gitignore
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M json-impl/src/test/resources/site/.idea/workspace.xml
Log Message:
-----------
Minor updates only.
Commit: 01c4ce36e230119610ed4d76c2777335138e85bf
https://github.com/cytoscape/cytoscape-impl/commit/01c4ce36e230119610ed4d76c2777335138e85bf
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 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).
Commit: b86cfeb08f6a6cb3a78ff6740c31bd7a609a8c13
https://github.com/cytoscape/cytoscape-impl/commit/b86cfeb08f6a6cb3a78ff6740c31bd7a609a8c13
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONNetworkWriterFactory.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriterFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ColorSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsNetworkSerializer.java
M
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
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsViewSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsVisualStyleModule.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsVisualStyleSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsVsiaulStyleSetSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapejsModule.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkSerializer.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsCyNetworkViewSerializer.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVisualStyleSerializer.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/JsVsiaulStyleSetSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ShapeSerializer.java
A
json-impl/src/test/java/org/cytoscape/io/internal/write/json/AbstractJsonNetworkViewWriterTest.java
A
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsViewWriterTest.java
A
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsVisualStyleSerializerTest.java
R
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JSONNetworkViewWriterTest.java
R
json-impl/src/test/java/org/cytoscape/io/internal/write/json/JsVisualStyleSerializerTest.java
M json-impl/src/test/resources/site/.idea/workspace.xml
A json-impl/src/test/resources/site/app/data/cytoscapeJsNetwork1.json
A json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
M json-impl/src/test/resources/site/app/scripts/main.js
M json-impl/src/test/resources/site/bower.json
Log Message:
-----------
Adding serializers for visual properties. This version does not pass tests
yet.
Commit: c4ebd44e7458ae51dd7a5457a35c5ade5b9b8ad0
https://github.com/cytoscape/cytoscape-impl/commit/c4ebd44e7458ae51dd7a5457a35c5ade5b9b8ad0
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/pom.xml
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONVisualStyleWriterFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ArrowShapeSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ContinuousMappingSerializer.java
M
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/CytoscapeJsVisualStyleModule.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsVisualStyleSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/DiscreteMappingSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/FontFaceSerializer.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/LineStyleSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/PassthroughMappingSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/ShapeSerializer.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/VisualMappingSerializer.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsVisualStyleSerializerTest.java
M json-impl/src/test/resources/site/app/data/cytoscapeJsNetwork1.json
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
Adding mapping generators for VS Writers. Not finished yet
Commit: fb7e562e1b91a8afb4905a8297ab41224050a924
https://github.com/cytoscape/cytoscape-impl/commit/fb7e562e1b91a8afb4905a8297ab41224050a924
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReader.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
A json-impl/src/test/resources/site/app/data/cytoscapeJsNetwork2.json
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
Cytoscape.js network file reader has been updated. Still need to add table
data handler.
Commit: df1d927c6191df035af9b1b54099d4f01f4d9d90
https://github.com/cytoscape/cytoscape-impl/commit/df1d927c6191df035af9b1b54099d4f01f4d9d90
Author: Scooter Morris <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
A rest-impl/src/main/java/org/cytoscape/rest/internal/Main.java.save
A rest-impl/src/test/java/org/cytoscape/MyResourceTest.java.save
Log Message:
-----------
Initial implementation of REST server for commands
Change-Id: Ie986a6ce3692c31dacdc6cbfc00f022f3a5f273d
Commit: 1a540854f18b76a51284b324e2d10636d8565679
https://github.com/cytoscape/cytoscape-impl/commit/1a540854f18b76a51284b324e2d10636d8565679
Author: Scooter Morris <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
R rest-impl/src/main/java/org/cytoscape/rest/internal/Main.java.save
R rest-impl/src/test/java/org/cytoscape/MyResourceTest.java.save
Log Message:
-----------
Remove template files from Jersey
Change-Id: I47baf8b4c9db41cba3a92e21463d79b878a73ffa
Commit: 4d0bd0877dffd176741bf4f36ff18c74f06237cb
https://github.com/cytoscape/cytoscape-impl/commit/4d0bd0877dffd176741bf4f36ff18c74f06237cb
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
Minor updates only.
Commit: 5875643e2a758a1fce2ae773b157464e29d0ae1f
https://github.com/cytoscape/cytoscape-impl/commit/5875643e2a758a1fce2ae773b157464e29d0ae1f
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
Data table reader updated for Cytoscpae..js format. Need to update List data
type handler.
Commit: 31dea663273660a3d76e31d1d1bfee6ba1da6c4d
https://github.com/cytoscape/cytoscape-impl/commit/31dea663273660a3d76e31d1d1bfee6ba1da6c4d
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M
json-impl/src/main/java/org/cytoscape/io/internal/write/json/JSONNetworkWriterFactory.java
A
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapeJsNetworkModule.java
R
json-impl/src/main/java/org/cytoscape/io/internal/write/json/serializer/CytoscapejsModule.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsViewWriterTest.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsVisualStyleSerializerTest.java
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
CytoscapejsModule has been renamed.
Commit: 79285646a8309f11a6ba880d51b22e5c8fb58bd2
https://github.com/cytoscape/cytoscape-impl/commit/79285646a8309f11a6ba880d51b22e5c8fb58bd2
Author: keiono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
M
json-impl/src/test/java/org/cytoscape/io/internal/write/json/CytoscapeJsVisualStyleSerializerTest.java
M json-impl/src/test/resources/site/app/data/cytoscapeJsStyle.json
Log Message:
-----------
List column handler has been updated, but not finished.
Commit: 533ef5fb80672096b601442df32321975403edd9
https://github.com/cytoscape/cytoscape-impl/commit/533ef5fb80672096b601442df32321975403edd9
Author: Keiichiro Ono <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReader.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReaderFactory.java
M
json-impl/src/test/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReaderTest.java
A json-impl/src/test/resources/testData/galFiltered.cyjs
Log Message:
-----------
New test cases for readers has been added.
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/e5b52f437a6a...533ef5fb8067
--
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.
