# # ChangeLog for trunk/test/unit in josm # # Generated by Trac 1.6 # 2024-12-01T06:06:00+01:00 Sun, 24 Jun 2012 19:15:57 GMT Don-vip [5299] * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) conflict dialog: better display of empty rows in members tab, like ... Sat, 12 May 2012 21:27:39 GMT bastiK [5236] * trunk/data_nodist/projection-regression-test-data.csv (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/ProjectionInfo.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) * removed offset option from UTM which is probably rarely used. ... Sun, 11 Mar 2012 20:19:59 GMT bastiK [5073] * trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/GaussKrueger.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java (added) * trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java (moved) * trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (moved) * trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (moved) * trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java (moved) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) move ntv2 to datum (see #7494) Sat, 10 Mar 2012 14:44:55 GMT bastiK [5065] * trunk/data_nodist/README (modified) * trunk/data_nodist/projection-regression-test-data.csv (added) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (added) add projection regression test This test fails whenever the ... Sat, 21 Jan 2012 14:45:59 GMT jttt [4837] * trunk/build.xml (modified) * trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) Fix tests Mon, 21 Nov 2011 20:57:20 GMT jttt [4603] * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) Fix tests Sun, 06 Nov 2011 14:00:56 GMT Don-vip [4580] * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/BoundsTests.java (added) * trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) see #2212 - Allow JOSM to download data crossing the 180th meridian Fri, 04 Nov 2011 00:17:49 GMT Don-vip [4574] * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) fix #7028 - Dragging map is extremely slow when large GPX file is loaded Thu, 03 Nov 2011 22:23:34 GMT Don-vip [4573] * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) see #7028 - improves GPX dragging performances by 50%, but the main ... Sat, 29 Oct 2011 07:01:30 GMT jttt [4546] * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (modified) Extend name templates with context switch - possibility to use tags ... Mon, 24 Oct 2011 19:27:10 GMT Don-vip [4541] * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/coor (added) * trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (added) Fixed rounding error in LatLon.roundToOsmPrecision() Sat, 17 Sep 2011 08:59:32 GMT jttt [4431] * trunk/data/tagging-preset.xsd (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NodeData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WayData.java (modified) * trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (modified) Custom primitive name formatters via tagging presets Sun, 07 Aug 2011 07:08:29 GMT jttt [4282] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/BooleanProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java (added) * trunk/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/StringProperty.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java (added) * trunk/test/lib/unitils-core (added) * trunk/test/lib/unitils-core/commons-collections-3.2.jar (added) * trunk/test/lib/unitils-core/commons-lang-2.3.jar (added) * trunk/test/lib/unitils-core/commons-logging-1.1.jar (added) * trunk/test/lib/unitils-core/junit-4.4.jar (added) * trunk/test/lib/unitils-core/ognl-2.6.9.jar (added) * trunk/test/lib/unitils-core/unitils-core-3.1.jar (added) * trunk/test/unit/org/openstreetmap/josm/tools (added) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine (added) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (added) Allow to specify custom pattern for marker text labels Fri, 29 Jul 2011 20:17:31 GMT bastiK [4277] * trunk/data_nodist/projection-reference-data.csv (added) * trunk/test/generate-proj-data.pl (added) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (added) new test comparing josm projections with Proj.4 data Tue, 07 Jun 2011 17:05:14 GMT bastiK [4126] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/INode.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NodeData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java (added) * trunk/src/org/openstreetmap/josm/data/projection/Projections.java (modified) * trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java (modified) * trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (modified) * trunk/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java (modified) * trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (modified) * trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) * trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) memory optimizations for Node & WayPoint (Patch by Gubaer, modified) ... Thu, 05 May 2011 18:49:14 GMT bastiK [4074] * trunk/.classpath (modified) * trunk/build.xml (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) * trunk/test/config/test-unit-env.properties (modified) * trunk/test/functional/mapcss (added) * trunk/test/functional/mapcss/performance (added) * trunk/test/functional/mapcss/performance/PerformanceTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy (modified) mapcss: performance improvement for parent selector (by Gubaer) Mon, 02 May 2011 21:47:19 GMT bastiK [4069] * trunk/data_nodist/mapcss/relation.mapcss (added) * trunk/data_nodist/mapcss/relation.osm (added) * trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (added) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParserTokenManager.java (modified) * trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy (added) mapcss: add role based selection (collaborative work by Gubaer and me) Sun, 13 Mar 2011 23:25:41 GMT bastiK [3991] * trunk/test/data/styles/label-from-tag.mapcss (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy (modified) fix wrongly applied patch Sun, 13 Mar 2011 20:35:14 GMT bastiK [3990] * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.groovy (modified) fix "typo" Sun, 13 Mar 2011 19:48:25 GMT bastiK [3988] * trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy (added) added tests (patch by anonymous, see #6107) Fri, 01 Oct 2010 17:26:20 GMT jttt [3577] * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Fix tests Thu, 16 Sep 2010 08:27:46 GMT stoecker [3531] * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (modified) fix array preferences a bit Sun, 29 Aug 2010 14:05:49 GMT bastiK [3485] * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) another typo Sun, 29 Aug 2010 14:00:03 GMT bastiK [3484] * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) typo Sun, 29 Aug 2010 13:58:46 GMT bastiK [3483] * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) fixed tests for projection (see #5327) Sun, 29 Aug 2010 12:57:39 GMT bastiK [3480] * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (added) fixed some issues with world bounds; add basic projection tests Sun, 29 Aug 2010 12:55:25 GMT jttt [3479] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified) * trunk/src/org/openstreetmap/josm/command/PseudoCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) * trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Tag.java (modified) * trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (modified) * trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/tagging-preset.xsd (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) cosmetics Sun, 29 Aug 2010 10:58:38 GMT jttt [3476] * trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) QuadBuckets optimization - keep children as fields instead of 4-item ... Thu, 26 Aug 2010 21:56:47 GMT bastiK [3473] * trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/projection (added) * trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (added) see #5327 (patch by sbrunner) - Swissgrild uses approximate formulas ... Mon, 23 Aug 2010 19:12:50 GMT jttt [3459] * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) Fix tests Mon, 02 Aug 2010 06:56:53 GMT jttt [3402] * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) Fix tests Thu, 08 Jul 2010 06:41:20 GMT jttt [3367] * trunk/data_nodist/filterTests.osm (modified) * trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) Fix filters Sat, 03 Jul 2010 20:08:57 GMT stoecker [3362] * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) fix #5182 - Conflict system simplification - patch by Upliner Tue, 29 Jun 2010 18:51:40 GMT bastiK [3358] * trunk/data_nodist/filterTests.osm (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) added another filter test Tue, 29 Jun 2010 15:19:26 GMT bastiK [3356] * trunk/data_nodist/filterTests.osm (added) * trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (moved) * trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (added) added filter tests Sat, 29 May 2010 07:13:56 GMT jttt [3284] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) Fix tests Sat, 29 May 2010 07:06:16 GMT jttt [3283] * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) Fix tests Sat, 29 May 2010 06:50:22 GMT jttt [3282] * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) Fix tests Sun, 11 Apr 2010 10:08:22 GMT jttt [3175] * trunk/src/org/openstreetmap/josm/actions/ActionParameter.java (added) * trunk/src/org/openstreetmap/josm/actions/ParameterizedAction.java (added) * trunk/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java (added) * trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/preferences (added) * trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java (added) Allow to set parameters for actions on toolbar. Used by SearchAction ... Tue, 30 Mar 2010 07:35:23 GMT jttt [3166] * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) Different fix for #4815 - having bbox in each instance of Node would ... Tue, 23 Mar 2010 20:09:17 GMT jttt [3153] * trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/BBox.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (added) Return copy of bbox in Way.getBBox (to make sure internal copy won't ... Wed, 10 Mar 2010 18:11:58 GMT jttt [3107] * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) Fix #4624 Relations not rendered right away Mon, 08 Mar 2010 08:24:03 GMT jttt [3095] * trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) * trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Changes in multipolygon handling (see #4661), cosmetics Sat, 27 Feb 2010 16:04:37 GMT jttt [3056] * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) Revert fix for #4612 Sat, 27 Feb 2010 14:46:00 GMT jttt [3053] * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) Fix tests Tue, 23 Feb 2010 07:58:12 GMT jttt [3034] * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) Fix #4467 Don't silently drop locally deleted member primitives from ... Fri, 19 Feb 2010 20:43:42 GMT jttt [3025] * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DatasetFactory.java (added) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Fix tests Mon, 15 Feb 2010 08:03:57 GMT jttt [2990] * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (modified) * trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (modified) * trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified) * trunk/src/org/openstreetmap/josm/io/CacheFiles.java (modified) * trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified) * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) * trunk/src/org/openstreetmap/josm/tools/MultiMap.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Fix some eclipse warnings Sun, 14 Feb 2010 14:01:00 GMT jttt [2982] * trunk/src/org/openstreetmap/josm/data/osm/BBox.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) Calculate bbox for relations, use it in mappaint. Mon, 01 Feb 2010 04:52:48 GMT mjulius [2917] * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (modified) fix test Sun, 31 Jan 2010 17:15:15 GMT stoecker [2915] * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) * trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (moved) close #4458 - text fixes - patch by Andre Sat, 09 Jan 2010 14:49:04 GMT jttt [2789] * trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (moved) * trunk/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (modified) Fixed some FindBugs warnings Sun, 27 Dec 2009 23:16:32 GMT Gubaer [2690] * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/io/ChangsetQueryUrlParserTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (modified) * trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy (added) Test cases Thu, 24 Dec 2009 07:48:40 GMT jttt [2676] * trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Fix some of the warnings found by FindBugs Sun, 13 Dec 2009 10:48:12 GMT jttt [2626] * trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) * trunk/src/org/openstreetmap/josm/tools/Pair.java (modified) * trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) Fixed some of the warnings found by FindBugs Sat, 12 Dec 2009 16:10:01 GMT jttt [2620] * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) Remove OsmPrimitive.setIncomplete() Fri, 11 Dec 2009 22:07:59 GMT Gubaer [2613] * trunk/images/dialogs/changesetdialog.png (added) * trunk/images/dialogs/changesetdialog.svg (added) * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (added) * trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java (added) * trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (added) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (added) * trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java (added) * trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy (added) new: global in-memory cache for downloaded changesets new: toggle ... Thu, 10 Dec 2009 17:45:03 GMT Gubaer [2605] * trunk/test/unit/org/openstreetmap/josm/io (added) * trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (added) * trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy (added) Unit tests for r2604 Sun, 06 Dec 2009 13:43:18 GMT jttt [2587] * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) Added Way.hasIncompletNodes(), Way.isIncomplete() now returns true ... Sun, 06 Dec 2009 13:16:24 GMT jttt [2585] * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) Disable loading of josm properties in DataSetMergerTest - do not seem ... Sat, 05 Dec 2009 17:23:03 GMT jttt [2578] * trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) Encalupse OsmPrimitive.incomplete Thu, 03 Dec 2009 18:02:25 GMT Gubaer [2563] * trunk/images/dialogs/relation/downloadincomplete.png (added) * trunk/images/dialogs/relation/downloadincomplete.svg (added) * trunk/images/dialogs/relation/downloadincompleteselected.png (added) * trunk/images/dialogs/relation/downloadincompleteselected.svg (added) * trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) fixed #3400: relation editor: improvement to highlight an element ... Sun, 22 Nov 2009 11:45:38 GMT jttt [2498] * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) Removed unnecessary setting of OsmPrimitive.incomplete Thu, 19 Nov 2009 15:36:39 GMT Gubaer [2482] * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (added) Had to clean up key handling methods in OsmPrimtive. Semantics of ... Wed, 18 Nov 2009 17:50:38 GMT Gubaer [2471] * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) fixed #3963: Synchronize does not work Fri, 13 Nov 2009 09:24:58 GMT Gubaer [2443] * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (moved) Fixes problems with merging Tue, 10 Nov 2009 20:25:40 GMT Gubaer [2433] * trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (moved) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Improved test cases for MergeVisitor. Moved MergeVisitor and removed ... Mon, 09 Nov 2009 00:03:08 GMT Gubaer [2417] * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Had to update MergeVisitor as a consequence of the note in r2406 and ... Sun, 08 Nov 2009 12:38:44 GMT jttt [2407] * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (added) Added support for referrers Sat, 07 Nov 2009 06:26:15 GMT Gubaer [2396] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Made nodes, ways, and relations in DataSet private. Plugin updates to ... Mon, 02 Nov 2009 20:04:32 GMT jttt [2388] * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) Replace Dataset.nodes with getNodes(), etc Mon, 02 Nov 2009 06:51:28 GMT jttt [2381] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Change most occurrences of Dataset.nodes/ways/relations with ... Thu, 15 Oct 2009 20:24:12 GMT Gubaer [2292] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Updated test case Mon, 05 Oct 2009 22:07:00 GMT Gubaer [2252] * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapScaler.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapSlider.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/help (added) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (added) * trunk/src/org/openstreetmap/josm/gui/help/HelpBuilder.java (added) * trunk/src/org/openstreetmap/josm/gui/help/Helpful.java (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Refactored JOSM help system, slightly extended Fixed problem with ... Sun, 20 Sep 2009 09:46:08 GMT Gubaer [2168] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload (added) * trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (moved) * trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (added) * trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (added) * trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (added) * trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (added) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (added) fixed #3304: Upload failed - Placeholder Relation not found fixed ... Wed, 16 Sep 2009 19:40:09 GMT Gubaer [2150] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Updating test cases Mon, 07 Sep 2009 21:06:19 GMT Gubaer [2077] * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) Had to replace DataSet:getPrimitiveById(id) with ... Sun, 06 Sep 2009 21:12:51 GMT Gubaer [2071] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Updated unit test Tue, 11 Aug 2009 11:23:06 GMT Gubaer [1954] * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair (added) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) Moved package org.openstreetmap.josm.gui.conflict to ... Mon, 10 Aug 2009 18:36:40 GMT jttt [1951] * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Replace some occurrences of RelationMember.member with getters Mon, 10 Aug 2009 11:13:31 GMT Gubaer [1948] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) fixed #3234: Update selection is broke for relations Sat, 08 Aug 2009 07:22:24 GMT jttt [1926] * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Replaced Relation.members with Relation.getMember() or ... Wed, 05 Aug 2009 08:25:23 GMT Gubaer [1912] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) Updated w.getNodes().contains(..) to w.containsNode(...) Wed, 05 Aug 2009 06:19:02 GMT jttt [1910] * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) Way refactoring - finish replacing Way.nodes with the new api Sun, 02 Aug 2009 21:15:26 GMT Gubaer [1890] * trunk/images/overlay/active.png (added) * trunk/images/overlay/active.svg (added) * trunk/images/overlay/invisiblenew.png (added) * trunk/images/overlay/invisiblenew.svg (added) * trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (added) * trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (added) * trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (added) * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (added) update: rewrite of layer dialog new: allows multiple selection of ... Sun, 19 Jul 2009 16:31:22 GMT jttt [1813] * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) Make tests compile using new ProgressMonitor API Sat, 18 Jul 2009 21:31:42 GMT Gubaer [1806] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (added) * trunk/test/config/test-functional-env.properties (moved) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (added) added OsmServerBackreferenceReader - reads primitives referring to a ... Wed, 08 Jul 2009 20:58:37 GMT Gubaer [1753] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) fixed #2245: Merge layers doesn't update the "action" tags Wed, 08 Jul 2009 20:10:42 GMT Gubaer [1752] * trunk/test/config/test-unit-env.properties (added) * trunk/test/unit/build.xml (deleted) clean up in unit test environment Wed, 08 Jul 2009 20:06:58 GMT Gubaer [1751] * trunk/build.xml (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/test-unit-env.properties (deleted) patch by dmuecke - improved unit tests and test targets in build.xml Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict (added) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/test/config (added) * trunk/test/config/unit-josm.home (added) * trunk/test/config/unit-josm.home/preferences (added) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) new: replaced global conflict list by conflict list per layer, ... Sat, 27 Jun 2009 12:03:30 GMT Gubaer [1707] * trunk/test/functional/org/openstreetmap/josm/gui (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/history (added) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (added) * trunk/test/lib (added) * trunk/test/lib/fest (added) * trunk/test/lib/fest/LICENSE-2.0.txt (added) * trunk/test/lib/fest/MRJToolkitStubs-1.0.jar (added) * trunk/test/lib/fest/README.txt (added) * trunk/test/lib/fest/debug-1.0.jar (added) * trunk/test/lib/fest/fest-assert-1.0.jar (added) * trunk/test/lib/fest/fest-reflect-1.1.jar (added) * trunk/test/lib/fest/fest-swing-1.1.jar (added) * trunk/test/lib/fest/fest-util-1.0.jar (added) * trunk/test/lib/fest/jcip-annotations-1.0.jar (added) * trunk/test/lib/junit (added) * trunk/test/lib/junit/README.txt (added) * trunk/test/lib/junit/cpl-v10.html (added) * trunk/test/lib/junit/junit-4.6.jar (added) * trunk/test/unit/build.xml (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) test cases and test libraries (JUnit 4.6 and FEST) Sat, 27 Jun 2009 09:05:23 GMT Gubaer [1703] * trunk/test/functional (added) * trunk/test/functional/org (added) * trunk/test/functional/org/openstreetmap (added) * trunk/test/functional/org/openstreetmap/josm (added) * trunk/test/functional/org/openstreetmap/josm/io (added) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (added) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (added) * trunk/test/functional/test-functional-env.properties (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (added) added test cases Sat, 27 Jun 2009 00:30:28 GMT Gubaer [1702] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) cosmetics Sat, 27 Jun 2009 00:14:00 GMT Gubaer [1701] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (added) * trunk/test/unit/test-unit-env.properties (added) updated merge logic and unit tests for MergeVisitor Mon, 15 Jun 2009 18:22:46 GMT Gubaer [1670] * trunk/images/updateselection.png (added) * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (added) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (modified) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (added) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (added) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history (added) * trunk/src/org/openstreetmap/josm/data/osm/history/History.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (added) * trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (added) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (added) * trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (added) * trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified) * trunk/test/unit/org/openstreetmap/josm/data (added) * trunk/test/unit/org/openstreetmap/josm/data/osm (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/history (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (added) fixed: bug in OsmApi.getOsmApi() cleanup: exception handling in ... Sun, 07 Jun 2009 21:22:54 GMT Gubaer [1654] * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/MergeDecisionType.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) added merge support for coordinate conflicts added merge support for ... Sun, 07 Jun 2009 13:04:28 GMT Gubaer [1650] * trunk/.classpath (modified) * trunk/.settings/org.eclipse.jdt.core.prefs (modified) * trunk/.settings/org.eclipse.jdt.ui.prefs (modified) * trunk/build.xml (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListRole.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) added concept of "merge pairs" (my vs. merged, my vs. their, their ... Mon, 01 Jun 2009 20:20:03 GMT Gubaer [1631] * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation (added) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMerger.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) added support for merging member lists of relations in extended ... Tue, 26 May 2009 19:44:31 GMT Gubaer [1622] * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergeDecisionType.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/UndecidedTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (added) * trunk/test (added) * trunk/test/unit (added) * trunk/test/unit/org (added) * trunk/test/unit/org/openstreetmap (added) * trunk/test/unit/org/openstreetmap/josm (added) * trunk/test/unit/org/openstreetmap/josm/gui (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (added) first version of extended conflict resolution dialog.