Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
CCLSCCM
FileUMSMUMSMUMSM
/source/org/jfree/chart/renderer/AbstractRenderer.java6237380180--0SM
/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java5231196--0SM
/source/org/jfree/chart/renderer/xy/XYItemRenderer.java4531028--0SM
/source/org/jfree/chart/plot/ThermometerPlot.java151411491--0SM
/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java1298253--0SM
/source/org/jfree/chart/plot/PiePlot.java119146111--0SM
/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java1197041--0SM
/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java983723--0SM
/source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java1054224--0SM
/source/org/jfree/chart/ChartPanel.java753022--0SM
/source/org/jfree/chart/axis/Axis.java839090--2SM
/source/org/jfree/chart/plot/CategoryPlot.java7412849--0SM
/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java655552--0SM
/source/org/jfree/chart/renderer/xy/CandlestickRenderer.java62388--1SM
/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java439690--0SM
/tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java432927--0SM
/tests/org/jfree/chart/renderer/xy/junit/YIntervalRendererTests.java431614--0SM
/source/org/jfree/chart/plot/FastScatterPlot.java423848--3SM
/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java423020--0SM
/swt/org/jfree/experimental/chart/swt/ChartComposite.java4159873--0SM
/source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java323734--0SM
/tests/org/jfree/chart/renderer/xy/junit/XYBoxAndWhiskerRendererTests.java41128--0SM
/source/org/jfree/chart/renderer/category/WaterfallBarRenderer.java317362--0SM
/source/org/jfree/chart/axis/ValueAxis.java311872--1SM
/source/org/jfree/chart/axis/SymbolAxis.java31168--0SM
/source/org/jfree/chart/renderer/category/LevelRenderer.java31194--0SM
/source/org/jfree/data/time/TimePeriodValuesCollection.java31123--0SM
/source/org/jfree/chart/renderer/xy/XYDotRenderer.java218278--0SM
/source/org/jfree/chart/renderer/xy/YIntervalRenderer.java301130--0SM
/experimental/org/jfree/experimental/chart/annotations/XYTitleAnnotation.java212826--0SM
/source/org/jfree/chart/annotations/CategoryLineAnnotation.java211039--0SM
/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer.java212721--1SM
/source/org/jfree/chart/annotations/CategoryTextAnnotation.java21731--1SM
/source/org/jfree/chart/util/RelativeDateFormat.java211716--0SM
/source/org/jfree/chart/axis/ModuloAxis.java21267--0SM
/source/org/jfree/chart/plot/Plot.java30270--4SM
/source/org/jfree/chart/plot/CombinedRangeXYPlot.java211512--0SM
/source/org/jfree/chart/plot/CombinedDomainXYPlot.java211512--0SM
/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java211412--0SM
/source/org/jfree/chart/block/EmptyBlock.java21139--0SM
/source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java21136--1SM
/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java30150--0SM
/source/org/jfree/chart/imagemap/StandardToolTipTagFragmentGenerator.java21114--0SM
/source/org/jfree/chart/imagemap/OverLIBToolTipTagFragmentGenerator.java21114--0SM
/source/org/jfree/chart/title/LegendItemBlockContainer.java30140--0SM
/tests/org/jfree/chart/title/junit/ImageTitleTests.java2186--0SM
/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java2194--1SM
/tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java2174--0SM
/source/org/jfree/data/time/TimeSeriesCollection.java2174--0SM
/tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java2164--0SM
/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer2.java2171--1SM
/source/org/jfree/chart/renderer/LookupPaintScale.java3050--0SM
/source/org/jfree/data/time/RegularTimePeriod.java2040--1SM
/source/org/jfree/chart/plot/dial/StandardDialScale.java108320--0SM
/source/org/jfree/chart/plot/dial/DialValueIndicator.java105990--0SM
/source/org/jfree/chart/plot/dial/DialPointer.java105520--0SM
/source/org/jfree/chart/renderer/xy/GradientXYBarPainter.java104220--0SM
/source/org/jfree/chart/renderer/category/GradientBarPainter.java104220--0SM
/tests/org/jfree/chart/axis/junit/LogAxisTests.java104120--0SM
/source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java103660--0SM
/source/org/jfree/chart/plot/dial/StandardDialRange.java103570--0SM
/source/org/jfree/chart/plot/dial/DialTextAnnotation.java103250--0SM
/tests/org/jfree/chart/plot/dial/junit/DialValueIndicatorTests.java102720--0SM
/source/org/jfree/chart/plot/dial/DialCap.java102610--0SM
/tests/org/jfree/chart/plot/dial/junit/DialBackgroundTests.java102440--0SM
/source/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java102400--0SM
/tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java102340--0SM
/source/org/jfree/chart/title/ShortTextTitle.java102240--0SM
/source/org/jfree/chart/renderer/xy/StandardXYBarPainter.java102040--0SM
/source/org/jfree/chart/renderer/category/StandardBarPainter.java102040--0SM
/tests/org/jfree/chart/renderer/xy/junit/XYSplineRendererTests.java101520--0SM
/tests/org/jfree/chart/urls/junit/CustomPieURLGeneratorTests.java101510--0SM
/tests/org/jfree/chart/renderer/xy/junit/GradientXYBarPainterTests.java101360--0SM
/tests/org/jfree/chart/renderer/category/junit/GradientBarPainterTests.java101360--0SM
/source/org/jfree/chart/plot/dial/AbstractDialLayer.java101280--0SM
/tests/org/jfree/chart/renderer/xy/junit/StandardXYBarPainterTests.java101120--0SM
/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java101120--0SM
/source/org/jfree/chart/editor/DefaultColorBarEditor.java101110--0SM
/source/org/jfree/chart/axis/TickType.java10740--0SM
/source/org/jfree/chart/encoders/KeypointPNGEncoderAdapter.java10410--0SM
/tests/org/jfree/chart/imagemap/junit/ImageMapPackageTests.java10360--0SM
/source/org/jfree/chart/plot/PlotUtilities.java10320--0SM
/source/org/jfree/chart/renderer/xy/XYBarPainter.java10220--0SM
/source/org/jfree/chart/renderer/category/BarPainter.java10220--0SM
/source/org/jfree/chart/axis/StandardTickUnitSource.java10180--0SM
/source/org/jfree/data/statistics/MultiValueCategoryDataset.java10140--0SM
/tests/org/jfree/chart/annotations/junit/XYBoxAnnotationTests.java10120--0SM
/source/org/jfree/chart/title/ImageTitle.java10120--0SM
/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java10100--0SM
/source/org/jfree/chart/renderer/xy/HighLowRenderer.java1080--0SM
/source/org/jfree/chart/plot/CombinedDomainCategoryPlot.java1080--0SM
/source/org/jfree/chart/editor/DefaultTitleEditor.java1080--0SM
/source/org/jfree/chart/LegendItem.java1080--0SM
/source/org/jfree/chart/needle/MeterNeedle.java1070--0SM
/source/org/jfree/chart/imagemap/StandardURLTagFragmentGenerator.java1070--0SM
/source/org/jfree/chart/renderer/xy/WindItemRenderer.java1070--1SM
/tests/org/jfree/chart/renderer/xy/junit/XYBlockRendererTests.java1060--0SM
/source/org/jfree/chart/plot/PlotOrientation.java1060--0SM
/source/org/jfree/chart/plot/DatasetRenderingOrder.java1060--0SM
/source/org/jfree/chart/block/ColorBlock.java1060--0SM
/source/org/jfree/chart/renderer/xy/DeviationRenderer.java1050--0SM
/source/org/jfree/chart/plot/IntervalMarker.java1050--0SM
/source/org/jfree/chart/renderer/category/BarRenderer3D.java1050--1SM
/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java1040--0SM
/tests/org/jfree/chart/plot/junit/CategoryMarkerTests.java1040--0SM
/tests/org/jfree/chart/annotations/junit/XYTextAnnotationTests.java1040--0SM
/tests/org/jfree/chart/annotations/junit/XYImageAnnotationTests.java1040--0SM
/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java1040--0SM
/source/org/jfree/data/DefaultKeyedValues.java1040--0SM
/source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java1040--0SM
/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java1040--0SM
/tests/org/jfree/chart/renderer/xy/junit/XYBarRendererTests.java1030--0SM
/source/org/jfree/data/xy/XYSeries.java1030--0SM
/source/org/jfree/data/xy/MatrixSeriesCollection.java1030--0SM
/source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java1030--0SM
/source/org/jfree/chart/renderer/AreaRendererEndType.java1030--0SM
/source/org/jfree/chart/plot/CombinedRangeCategoryPlot.java1030--0SM
/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java1030--0SM
/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java1030--0SM
/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java1030--0SM
/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java1030--0SM
/source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java1030--0SM
/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java1030--0SM
/source/org/jfree/chart/JFreeChart.java1030--1SM
/tests/org/jfree/chart/renderer/xy/junit/XYLine3DRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/xy/junit/XYErrorRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/xy/junit/WindItemRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/xy/junit/VectorRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/xy/junit/DeviationRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/WaterfallBarRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/StackedBarRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/StackedAreaRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/DefaultCategoryItemRendererTests.java1020--0SM
/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/XYShapeAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/XYPolygonAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/XYPointerAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/XYLineAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/CategoryTextAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/CategoryPointerAnnotationTests.java1020--0SM
/tests/org/jfree/chart/annotations/junit/CategoryLineAnnotationTests.java1020--0SM
/source/org/jfree/data/xy/YIntervalSeriesCollection.java1020--0SM
/source/org/jfree/data/xy/XYSeriesCollection.java1020--0SM
/source/org/jfree/data/xy/XYIntervalSeriesCollection.java1020--0SM
/source/org/jfree/data/xy/XIntervalSeriesCollection.java1020--0SM
/source/org/jfree/data/xy/VectorSeriesCollection.java1020--0SM
/source/org/jfree/data/xy/DefaultTableXYDataset.java1020--0SM
/source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java1020--0SM
/source/org/jfree/chart/entity/ChartEntity.java1020--0SM
/source/org/jfree/chart/LegendItemCollection.java1020--0SM
/source/org/jfree/chart/resources/JFreeChartResources.java1020--1SM
/tests/org/jfree/chart/renderer/xy/junit/ClusteredXYBarRendererTests.java1010--0SM
/tests/org/jfree/chart/renderer/junit/AbstractRendererTests.java3232147133--0SM
/source/org/jfree/chart/axis/SegmentedTimeline.java11118583--0SM
/tests/org/jfree/chart/labels/junit/BoxAndWhiskerXYToolTipGeneratorTests.java10106868--0SM
/swt/org/jfree/experimental/chart/swt/editor/SWTAxisEditor.java774848--0SM
/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java773924--0SM
/source/org/jfree/chart/ChartFactory.java55206206--0SM
/tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java554141--0SM
/tests/org/jfree/chart/labels/junit/HighLowItemLabelGeneratorTests.java552828--0SM
/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java552828--0SM
/source/org/jfree/chart/axis/ValueTick.java443833--0SM
/tests/org/jfree/chart/renderer/xy/junit/XYLineAndShapeRendererTests.java441414--0SM
/source/org/jfree/chart/plot/CompassPlot.java4488--0SM
/source/org/jfree/chart/axis/CategoryAxis.java333513--0SM
/tests/org/jfree/chart/labels/junit/BoxAndWhiskerToolTipGeneratorTests.java332020--0SM
/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java331616--0SM
/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java331616--0SM
/source/org/jfree/chart/axis/NumberAxis.java331313--0SM
/source/org/jfree/chart/imagemap/ImageMapUtilities.java227070--0SM
/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java224242--0SM
/tests/org/jfree/data/time/junit/WeekTests.java223838--0SM
/tests/org/jfree/data/xy/junit/YIntervalSeriesTests.java223630--0SM
/tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java223630--0SM
/tests/org/jfree/data/time/ohlc/junit/OHLCSeriesTests.java223630--0SM
/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java223232--0SM
/source/org/jfree/chart/axis/PeriodAxis.java222525--0SM
/source/org/jfree/chart/plot/SpiderWebPlot.java221919--0SM
/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java2299--0SM
/source/org/jfree/chart/plot/Zoomable.java22108--0SM
/source/org/jfree/chart/axis/TickUnits.java2288--0SM
/tests/org/jfree/chart/junit/LegendItemCollectionTests.java2277--0SM
/tests/org/jfree/data/time/junit/YearTests.java2266--0SM
/tests/org/jfree/data/time/junit/SecondTests.java2266--0SM
/tests/org/jfree/data/time/junit/QuarterTests.java2266--0SM
/tests/org/jfree/data/time/junit/MonthTests.java2266--0SM
/tests/org/jfree/data/time/junit/MinuteTests.java2266--0SM
/tests/org/jfree/data/time/junit/MillisecondTests.java2266--0SM
/tests/org/jfree/data/time/junit/HourTests.java2266--0SM
/tests/org/jfree/data/time/junit/DayTests.java2266--0SM
/tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java2266--0SM
/source/org/jfree/chart/plot/MeterPlot.java2266--0SM
/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java2266--0SM
/source/org/jfree/chart/renderer/category/ScatterRenderer.java115149--0SM
/source/org/jfree/chart/plot/dial/StandardDialFrame.java1129516--0SM
/source/org/jfree/chart/plot/dial/DialBackground.java1119819--0SM
/source/org/jfree/chart/HashUtilities.java1112818--0SM
/tests/org/jfree/chart/urls/junit/CustomXYURLGeneratorTests.java118446--0SM
/experimental/org/jfree/experimental/chart/annotations/junit/XYTitleAnnotationTests.java116464--0SM
/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java117824--0SM
/tests/org/jfree/chart/axis/junit/ColorBarTests.java117413--0SM
/tests/org/jfree/data/category/junit/DefaultCategoryDatasetTests.java117016--0SM
/tests/org/jfree/data/junit/DefaultKeyedValues2DTests.java113232--0SM
/tests/org/jfree/chart/imagemap/junit/StandardURLTagFragmentGeneratorTests.java114418--0SM
/tests/org/jfree/chart/imagemap/junit/StandardToolTipTagFragmentGeneratorTests.java114216--0SM
/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java112121--0SM
/tests/org/jfree/chart/junit/HashUtilitiesTests.java112310--0SM
/tests/org/jfree/data/junit/DefaultKeyedValuesTests.java111616--0SM
/tests/org/jfree/chart/labels/junit/StandardXYToolTipGeneratorTests.java111616--0SM
/tests/org/jfree/chart/labels/junit/MultipleXYSeriesLabelGeneratorTests.java111616--0SM
/swt/org/jfree/experimental/chart/swt/editor/SWTTitleEditor.java111414--0SM
/swt/org/jfree/experimental/chart/swt/editor/SWTNumberAxisEditor.java111313--0SM
/tests/org/jfree/chart/plot/junit/MeterPlotTests.java111212--0SM
/swt/org/jfree/experimental/chart/swt/editor/SWTPlotAppearanceEditor.java111212--0SM
/source/org/jfree/data/DefaultKeyedValues2D.java111212--0SM
/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java1199--0SM
/tests/org/jfree/chart/plot/junit/PolarPlotTests.java1188--0SM
/swt/org/jfree/experimental/chart/swt/editor/SWTChartEditor.java1188--0SM
/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java1188--0SM
/tests/org/jfree/data/xy/junit/VectorSeriesTests.java1186--0SM
/source/org/jfree/data/DefaultKeyedValue.java1166--0SM
/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java1166--0SM
/tests/org/jfree/chart/util/junit/UtilPackageTests.java1155--0SM
/swt/org/jfree/experimental/chart/swt/demo/SWTPieChartDemo1.java1155--0SM
/source/org/jfree/chart/editor/DefaultPlotEditor.java1155--0SM
/tests/org/jfree/chart/plot/junit/PiePlotTests.java1144--0SM
/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java1144--0SM
/source/org/jfree/data/time/MovingAverage.java1144--0SM
/source/org/jfree/chart/renderer/OutlierList.java1144--0SM
/source/org/jfree/chart/plot/PieLabelDistributor.java1144--0SM
/source/org/jfree/chart/block/BorderArrangement.java1144--0SM
/source/org/jfree/chart/axis/QuarterDateFormat.java1144--0SM
/source/org/jfree/chart/axis/DateAxis.java1144--0SM
/tests/org/jfree/chart/urls/junit/UrlsPackageTests.java1133--0SM
/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java1122--0SM
/tests/org/jfree/chart/title/junit/CompositeTitleTests.java1122--0SM
/tests/org/jfree/chart/entity/junit/EntityPackageTests.java1122--0SM
/source/org/jfree/chart/renderer/category/BarRenderer.java1122--0SM
/source/org/jfree/chart/plot/WaferMapPlot.java1122--0SM
/source/org/jfree/chart/demo/PieChartDemo1.java1122--0SM
/source/org/jfree/chart/annotations/XYImageAnnotation.java1122--0SM
/source/org/jfree/chart/axis/NumberTick.java01012--0UM
/tests/org/jfree/chart/labels/junit/BubbleXYItemLabelGeneratorTests.java01016--0UM
/tests/org/jfree/chart/labels/junit/StandardPieToolTipGeneratorTests.java01016--0UM
/tests/org/jfree/chart/labels/junit/StandardXYItemLabelGeneratorTests.java01016--0UM
/tests/org/jfree/chart/labels/junit/StandardXYZToolTipGeneratorTests.java01016--0UM
/tests/org/jfree/chart/labels/junit/SymbolicXYItemLabelGeneratorTests.java01016--0UM
/tests/org/jfree/chart/junit/JFreeChartTests.java01042--0UM
/tests/org/jfree/data/xy/junit/XYSeriesCollectionTests.java01044--0UM
/tests/org/jfree/data/general/junit/DatasetUtilitiesTests.java1116--0UM
/tests/org/jfree/chart/labels/junit/StandardXYSeriesLabelGeneratorTests.java12420--0UM
/tests/org/jfree/chart/labels/junit/StandardPieSectionLabelGeneratorTests.java12824--0UM
/source/org/jfree/chart/util/LogFormat.java1216672--0UM
/source/org/jfree/chart/renderer/xy/XYSplineRenderer.java12345177--0UM
/source/org/jfree/chart/plot/dial/DialPlot.java12774158--0UM
/tests/org/jfree/chart/plot/junit/XYPlotTests.java131834--0UM
/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java13164122--0UM
/source/org/jfree/chart/plot/dial/ArcDialFrame.java13453106--0UM
/tests/org/jfree/data/xy/junit/XYSeriesTests.java23110110--0UM
/source/org/jfree/chart/axis/LogAxis.java14964254--0UM
/tests/org/jfree/chart/labels/junit/StandardCategorySeriesLabelGeneratorTests.java341632--0UM
/tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java346458--0UM
/source/org/jfree/data/general/DatasetUtilities.java4439201--0UM
/tests/org/jfree/chart/labels/junit/StandardCategoryToolTipGeneratorTests.java453046--0UM
/tests/org/jfree/chart/labels/junit/StandardCategoryItemLabelGeneratorTests.java563450--0UM
/tests/org/jfree/chart/labels/junit/IntervalCategoryLabelGeneratorTests.java783450--0UM
/source/org/jfree/chart/renderer/xy/XYStepRenderer.java89156142--0UM
/tests/org/jfree/data/category/junit/DefaultIntervalCategoryDatasetTests.java314220220--0UM
/source/org/jfree/chart/plot/PolarPlot.java996080--0UM
/source/org/jfree/chart/plot/ContourPlot.java121893126--0UM
/source/org/jfree/chart/plot/XYPlot.java1922249357--0UM