Branch: refs/heads/develop Home: https://github.com/cytoscape/cytoscape-impl Commit: e439d8447ff133652892a22a1d1a7ff6500b2aa4 https://github.com/cytoscape/cytoscape-impl/commit/e439d8447ff133652892a22a1d1a7ff6500b2aa4 Author: dotasek <dotasek....@gmail.com> Date: 2021-03-03 (Wed, 03 Mar 2021)
Changed paths: M app-impl/src/main/java/org/cytoscape/app/internal/task/ListAppsTask.java Log Message: ----------- Fixes CYTOSCAPE-12791 Quotes in App descriptions and other escape characters were not being properly escaped in output JSON. Commit: 99b0753d9ba2416c5018f0af9469b6299d6547e1 https://github.com/cytoscape/cytoscape-impl/commit/99b0753d9ba2416c5018f0af9469b6299d6547e1 Author: dotasek <dotasek....@gmail.com> Date: 2021-03-03 (Wed, 03 Mar 2021) Changed paths: M core-task-impl/src/main/java/org/cytoscape/task/internal/filter/ApplyFilterTask.java M core-task-impl/src/main/java/org/cytoscape/task/internal/filter/CreateFilterTask.java M core-task-impl/src/main/java/org/cytoscape/task/internal/filter/SelectFilterTask.java M core-task-impl/src/main/java/org/cytoscape/task/internal/filter/Sink.java A custom-graphics-internal/pom.xml A custom-graphics-internal/src/main/java/org/cytoscape/cg/event/CustomGraphicsLibraryUpdatedEvent.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/event/CustomGraphicsLibraryUpdatedListener.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/CyActivator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/action/CustomGraphicsManagerAction.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/AbstractChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/AbstractChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/AbstractChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/AbstractChartLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/ColorSchemeEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/CustomCategoryItemLabelGenerator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/CustomPieSectionLabelGenerator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/LabelPosition.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/bar/BarChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/bar/BarChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/bar/BarChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/bar/BarChartTypeJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/bar/BarLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/box/BoxChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/box/BoxChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/box/BoxChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/box/BoxLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/heatmap/HeatMapChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/heatmap/HeatMapChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/heatmap/HeatMapChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/heatmap/HeatMapLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/line/LineChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/line/LineChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/line/LineChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/line/LineLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/pie/PieChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/pie/PieChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/pie/PieChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/pie/PieLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/ring/RingChart.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/ring/RingChartEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/ring/RingChartFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/ring/RingLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/util/ColorGradient.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/charts/util/ColorScale.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/editor/CustomGraphicsVisualPropertyEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/editor/CyCustomGraphicsCellRenderer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/editor/CyCustomGraphicsPropertyEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/editor/CyCustomGraphicsValueEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/editor/ImageList.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/AbstractGradient.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/AbstractGradientEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/AbstractGradientLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/linear/LinearGradient.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/linear/LinearGradientEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/linear/LinearGradientFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/linear/LinearGradientLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/radial/RadialGradient.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/radial/RadialGradientEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/radial/RadialGradientFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/gradient/radial/RadialGradientLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/AbstractURLImageCustomGraphicsFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/BitmapCustomGraphicsFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/MissingBitmapCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/MissingImageCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/MissingSVGCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/image/SVGCustomGraphicsFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/ColorJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/ColorJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/ColorSchemeJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/ColorSchemeJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/CyColumnIdentifierJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/CyColumnIdentifierJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/Point2DJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/Point2DJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/PropertiesJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/PropertiesJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/Rectangle2DJsonDeserializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/json/Rectangle2DJsonSerializer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/model/CustomGraphics2ManagerImpl.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/model/CustomGraphicsManagerImpl.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/paint/ColorPaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/paint/GradientPaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/paint/LinearGradientPaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/paint/RadialGradientPaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/paint/TexturePaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/RestoreImagesTask.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/RestoreImagesTaskFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/SaveGraphicsToSessionTask.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/SaveGraphicsToSessionTaskFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/SaveUserImagesTask.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/task/SaveUserImagesTaskFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/ui/CustomGraphicsCellRenderer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/ui/CustomGraphicsDetailPanel.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/ui/CustomGraphicsListModel.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/ui/CustomGraphicsManagerDialog.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/ColorKeyword.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/ColorUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/ControlPoint.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/EqualDashStroke.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/GradientEditor.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/IconUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/ImageUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/MathUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/PaintFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/PointPicker.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/SortedListModel.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/TextIcon.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/ViewUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/VisualPropertyIcon.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/util/VisualPropertyIconFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/CustomGraphicsProperty.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/GradientLayerCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/GradientOvalFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/GradientOvalLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/GradientRoundRectangleFactory.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/GradientRoundRectangleLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/PaintCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/internal/vector/VectorCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/AbstractCustomGraphics2.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/AbstractDCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/AbstractURLImageCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/BitmapCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/BitmapLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CGComparator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/ColorScheme.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphics2Manager.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsManager.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsPropertyImpl.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsRange.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsTranslator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsUtil.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/CustomGraphicsVisualProperty.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/DummyCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/IDGenerator.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/NullCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/Orientation.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/RenderingContext.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/Rotation.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/SVGCustomGraphics.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/SVGLayer.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/model/Taggable.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/util/CustomGraphicsBrowser.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/util/CustomGraphicsIcon.java A custom-graphics-internal/src/main/java/org/cytoscape/cg/util/ImageCustomGraphicsSelector.java A custom-graphics-internal/src/main/resources/images/charts/bar-chart.png A custom-graphics-internal/src/main/resources/images/charts/box-chart.png A custom-graphics-internal/src/main/resources/images/charts/heatmap-chart.png A custom-graphics-internal/src/main/resources/images/charts/line-chart.png A custom-graphics-internal/src/main/resources/images/charts/pie-chart.png A custom-graphics-internal/src/main/resources/images/charts/ring-chart.png A custom-graphics-internal/src/main/resources/images/no_image.png A custom-graphics-internal/src/main/resources/images/no_image.svg A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Danio_rerio_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Danio_rerio_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Mus_musculus_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Mus_musculus_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_L.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_NL.png A custom-graphics-internal/src/main/resources/images/sampleCustomGraphics/about_icons.txt M ding-impl/ding-presentation-impl/pom.xml 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/DVisualLexicon.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractCustomGraphics2.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/ColorScheme.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsManager.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPositionCalculator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsTranslator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsUtil.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics2Manager.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics2ManagerImpl.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/DummyCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/IDGenerator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Orientation.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/RenderingContext.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Rotation.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Taggable.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/AbstractURLImageCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/AbstractURLImageCustomGraphicsFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/BitmapCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/BitmapCustomGraphicsFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/BitmapLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/MissingBitmapCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/MissingImageCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/MissingSVGCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/SVGCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/SVGCustomGraphicsFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/image/SVGLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/ColorJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/ColorJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/ColorSchemeJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/ColorSchemeJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/CyColumnIdentifierJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/CyColumnIdentifierJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/Point2DJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/Point2DJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/PropertiesJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/PropertiesJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/Rectangle2DJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/json/Rectangle2DJsonSerializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/paint/ColorPaintFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/paint/GradientPaintFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/paint/LinearGradientPaintFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/paint/RadialGradientPaintFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/paint/TexturePaintFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/CustomGraphicsProperty.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientLayerCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/PaintCustomGraphic.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/VectorCustomGraphics.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CGComparator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImagesTask.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImagesTaskFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/SaveGraphicsToSessionTask.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/SaveGraphicsToSessionTaskFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/SaveUserImagesTask.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/SaveUserImagesTaskFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/action/CustomGraphicsManagerAction.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/event/CustomGraphicsLibraryUpdatedEvent.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/event/CustomGraphicsLibraryUpdatedListener.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsCellRenderer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsListModel.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/dependency/CustomGraphicsSizeDependencyFactory.java R 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/VisualPropertyIconFactory.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DRenderingEngine.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/ImageAnnotationImpl.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/create/ImageAnnotationFactory.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/LoadImageDialog.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ReloadImagesTask.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/CustomGraphicsVisualPropertyEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/CyCustomGraphicsCellRenderer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/CyCustomGraphicsPropertyEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/CyCustomGraphicsValueEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ImageCustomGraphicsSelector.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/AbstractChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/AbstractChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/AbstractChartLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ColorSchemeEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/CustomCategoryItemLabelGenerator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/CustomPieSectionLabelGenerator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/LabelPosition.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ViewUtils.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/bar/BarChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/bar/BarChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/bar/BarChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/bar/BarChartTypeJsonDeserializer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/bar/BarLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/box/BoxChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/box/BoxChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/box/BoxChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/box/BoxLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/heatmap/HeatMapChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/heatmap/HeatMapChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/heatmap/HeatMapChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/heatmap/HeatMapLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/line/LineChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/line/LineChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/line/LineChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/line/LineLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/pie/PieChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/pie/PieChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/pie/PieChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/pie/PieLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ring/RingChart.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ring/RingChartEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ring/RingChartFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/ring/RingLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/util/ColorGradient.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/charts/util/ColorScale.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/AbstractGradient.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/AbstractGradientEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/AbstractGradientLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/linear/LinearGradient.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/linear/LinearGradientEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/linear/LinearGradientFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/linear/LinearGradientLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/radial/RadialGradient.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/radial/RadialGradientEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/radial/RadialGradientFactory.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/gradients/radial/RadialGradientLayer.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/util/ControlPoint.java A ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/util/CustomGraphicsPositionCalculator.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/util/GradientEditor.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/internal/util/PointPicker.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/immed/GraphGraphics.java M ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/CustomGraphicsInfo.java R ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/PaintFactory.java R ding-impl/ding-presentation-impl/src/main/resources/images/charts/bar-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/charts/box-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/charts/heatmap-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/charts/line-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/charts/pie-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/charts/ring-chart.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_L.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_NL.png R ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/about_icons.txt M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewApplyTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AbstractAnnotationTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/BarChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/BoxChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/HeatMapChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/LineChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/PieChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/charts/RingChartTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/gradients/LinearGradientTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/internal/gradients/RadialGradientTest.java M ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DVisualLexiconTest.java M pom.xml M swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java M swing-application-impl/src/main/java/org/cytoscape/internal/command/HelpGenerator.java M table-browser-impl/pom.xml M table-browser-impl/src/main/java/org/cytoscape/browser/internal/util/ViewUtil.java M table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/AbstractTableBrowser.java M table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/DefaultTableBrowser.java M table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/GlobalTableBrowser.java M table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/TableBrowserMediator.java M table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/TableBrowserToolBar.java A table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/tools/AbstractToolBarControl.java A table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/tools/GeneralOptionsControl.java A table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/tools/RowHeightControl.java A table-browser-impl/src/main/java/org/cytoscape/browser/internal/view/tools/ViewModeControl.java M table-presentation-impl/pom.xml M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/BrowserTableVisualLexicon.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/CyActivator.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/TableRenderingEngineImpl.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/VisualPropertyChangeListener.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/impl/BrowserTable.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/impl/BrowserTableCellRenderer.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/impl/BrowserTableModel.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/impl/BrowserTablePresentation.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/impl/icon/VisualPropertyIconFactory.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/util/TableBrowserUtil.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/util/ValidatedObjectAndEditString.java M table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/util/ValidatedObjectAndEditStringComparator.java A table-presentation-impl/src/main/java/org/cytoscape/view/table/internal/util/ViewUtil.java A table-presentation-impl/src/main/resources/images/sparklines/bar-chart.png A table-presentation-impl/src/main/resources/images/sparklines/line-chart.png A table-presentation-impl/src/main/resources/images/sparklines/pie-chart.png M viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/base/VPStore.java M viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/network/spacial/SimpleSpacialIndex2DSnapshotImpl.java M viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/table/CyTableViewImpl.java M vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VisualPropertySheetModel.java M vizmap-gui-impl/src/main/resources/vizmapper.props Log Message: ----------- Merge remote-tracking branch 'origin/develop' into develop Compare: https://github.com/cytoscape/cytoscape-impl/compare/f15189790708...99b0753d9ba2 -- 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 view this discussion on the web visit https://groups.google.com/d/msgid/cytoscape-cvs/cytoscape/cytoscape-impl/push/refs/heads/develop/f15189-99b075%40github.com.