Changeset 1954 in josm for trunk


Ignore:
Timestamp:
2009-08-11T13:23:06+02:00 (12 years ago)
Author:
Gubaer
Message:

Moved package org.openstreetmap.josm.gui.conflict to org.openstreetmap.josm.gui.conflict.pair

Location:
trunk
Files:
1 added
34 edited
11 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

    r1750 r1954  
    1313import org.openstreetmap.josm.data.osm.Node;
    1414import org.openstreetmap.josm.data.osm.OsmPrimitive;
    15 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     15import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    1616import org.openstreetmap.josm.tools.ImageProvider;
    1717
  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r1750 r1954  
    1212import org.openstreetmap.josm.data.conflict.Conflict;
    1313import org.openstreetmap.josm.data.osm.OsmPrimitive;
    14 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     14import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    1515import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1616import org.openstreetmap.josm.tools.ImageProvider;
  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r1750 r1954  
    1515import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1616import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    17 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
    18 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
     17import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     18import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
    1919import org.openstreetmap.josm.tools.ImageProvider;
    2020
  • trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java

    r1901 r1954  
    1010import javax.swing.JDialog;
    1111import javax.swing.JOptionPane;
    12 import javax.swing.UIManager;
    1312
    1413import org.openstreetmap.josm.Main;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
     2package org.openstreetmap.josm.gui.conflict.pair;
    33
    44import java.awt.Color;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
    3 import static org.openstreetmap.josm.gui.conflict.ListRole.MERGED_ENTRIES;
    4 import static org.openstreetmap.josm.gui.conflict.ListRole.MY_ENTRIES;
    5 import static org.openstreetmap.josm.gui.conflict.ListRole.THEIR_ENTRIES;
     2package org.openstreetmap.josm.gui.conflict.pair;
     3import static org.openstreetmap.josm.gui.conflict.pair.ListRole.MERGED_ENTRIES;
     4import static org.openstreetmap.josm.gui.conflict.pair.ListRole.MY_ENTRIES;
     5import static org.openstreetmap.josm.gui.conflict.pair.ListRole.THEIR_ENTRIES;
    66import static org.openstreetmap.josm.tools.I18n.tr;
    77
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
     2package org.openstreetmap.josm.gui.conflict.pair;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2121import org.openstreetmap.josm.data.osm.Relation;
    2222import org.openstreetmap.josm.data.osm.Way;
    23 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMergeModel;
    24 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMerger;
    25 import org.openstreetmap.josm.gui.conflict.properties.OperationCancelledException;
    26 import org.openstreetmap.josm.gui.conflict.properties.PropertiesMergeModel;
    27 import org.openstreetmap.josm.gui.conflict.properties.PropertiesMerger;
    28 import org.openstreetmap.josm.gui.conflict.relation.RelationMemberListMergeModel;
    29 import org.openstreetmap.josm.gui.conflict.relation.RelationMemberMerger;
    30 import org.openstreetmap.josm.gui.conflict.tags.TagMergeModel;
    31 import org.openstreetmap.josm.gui.conflict.tags.TagMerger;
     23import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
     24import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
     25import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
     26import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
     27import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
     28import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberListMergeModel;
     29import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
     30import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
     31import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;
    3232import org.openstreetmap.josm.tools.ImageProvider;
    3333
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
    3 
    4 import static org.openstreetmap.josm.gui.conflict.ComparePairType.MY_WITH_MERGED;
    5 import static org.openstreetmap.josm.gui.conflict.ComparePairType.MY_WITH_THEIR;
    6 import static org.openstreetmap.josm.gui.conflict.ComparePairType.THEIR_WITH_MERGED;
    7 import static org.openstreetmap.josm.gui.conflict.ListRole.MERGED_ENTRIES;
    8 import static org.openstreetmap.josm.gui.conflict.ListRole.MY_ENTRIES;
    9 import static org.openstreetmap.josm.gui.conflict.ListRole.THEIR_ENTRIES;
     2package org.openstreetmap.josm.gui.conflict.pair;
     3
     4import static org.openstreetmap.josm.gui.conflict.pair.ComparePairType.MY_WITH_MERGED;
     5import static org.openstreetmap.josm.gui.conflict.pair.ComparePairType.MY_WITH_THEIR;
     6import static org.openstreetmap.josm.gui.conflict.pair.ComparePairType.THEIR_WITH_MERGED;
     7import static org.openstreetmap.josm.gui.conflict.pair.ListRole.MERGED_ENTRIES;
     8import static org.openstreetmap.josm.gui.conflict.pair.ListRole.MY_ENTRIES;
     9import static org.openstreetmap.josm.gui.conflict.pair.ListRole.THEIR_ENTRIES;
    1010import static org.openstreetmap.josm.tools.I18n.tr;
    1111
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r1950 r1954  
    1 package org.openstreetmap.josm.gui.conflict;
     1package org.openstreetmap.josm.gui.conflict.pair;
    22
    33import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
     2package org.openstreetmap.josm.gui.conflict.pair;
    33
    44/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java

    r1950 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict;
     2package org.openstreetmap.josm.gui.conflict.pair;
    33
    44public enum MergeDecisionType {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java

    r1650 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.nodes;
     2package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

    r1898 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.nodes;
     2package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1212import org.openstreetmap.josm.data.osm.Node;
    1313import org.openstreetmap.josm.data.osm.Way;
    14 import org.openstreetmap.josm.gui.conflict.ListMergeModel;
    15 import org.openstreetmap.josm.gui.conflict.ListRole;
     14import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
     15import org.openstreetmap.josm.gui.conflict.pair.ListRole;
    1616
    1717public class NodeListMergeModel extends ListMergeModel<Node>{
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

    r1642 r1954  
    1 package org.openstreetmap.josm.gui.conflict.nodes;
     1package org.openstreetmap.josm.gui.conflict.pair.nodes;
    22
    33import java.util.logging.Logger;
     
    88import org.openstreetmap.josm.data.osm.Node;
    99import org.openstreetmap.josm.data.osm.Way;
    10 import org.openstreetmap.josm.gui.conflict.ListMerger;
     10import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
    1111
    1212/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

    r1911 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.nodes;
     2package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2020import org.openstreetmap.josm.data.osm.Node;
    2121import org.openstreetmap.josm.data.osm.OsmPrimitive;
    22 import org.openstreetmap.josm.gui.conflict.ListMergeModel;
     22import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
    2323import org.openstreetmap.josm.tools.ImageProvider;
    2424
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java

    r1690 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.properties;
     2package org.openstreetmap.josm.gui.conflict.pair.properties;
    33
    44public class OperationCancelledException extends Exception {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

    r1938 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.properties;
    3 
    4 import static org.openstreetmap.josm.gui.conflict.MergeDecisionType.UNDECIDED;
     2package org.openstreetmap.josm.gui.conflict.pair.properties;
     3
     4import static org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType.UNDECIDED;
    55import static org.openstreetmap.josm.tools.I18n.tr;
    66
     
    2828import org.openstreetmap.josm.data.osm.Way;
    2929import org.openstreetmap.josm.gui.OptionPaneUtil;
    30 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     30import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    3131import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    3232import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

    r1847 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.properties;
     2package org.openstreetmap.josm.gui.conflict.pair.properties;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2626import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    2727import org.openstreetmap.josm.gui.OptionPaneUtil;
    28 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     28import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    2929import org.openstreetmap.josm.tools.ImageProvider;
    3030
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java

    r1650 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.relation;
     2package org.openstreetmap.josm.gui.conflict.pair.relation;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

    r1938 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.relation;
     2package org.openstreetmap.josm.gui.conflict.pair.relation;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1111import org.openstreetmap.josm.data.osm.Relation;
    1212import org.openstreetmap.josm.data.osm.RelationMember;
    13 import org.openstreetmap.josm.gui.conflict.ListMergeModel;
    14 import org.openstreetmap.josm.gui.conflict.ListRole;
     13import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
     14import org.openstreetmap.josm.gui.conflict.pair.ListRole;
    1515/**
    1616 * The model for merging two lists of relation members
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

    r1642 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.relation;
     2package org.openstreetmap.josm.gui.conflict.pair.relation;
    33
    44import java.util.logging.Logger;
     
    99import org.openstreetmap.josm.data.osm.Relation;
    1010import org.openstreetmap.josm.data.osm.RelationMember;
    11 import org.openstreetmap.josm.gui.conflict.ListMerger;
     11import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
    1212
    1313/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java

    r1930 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.relation;
     2package org.openstreetmap.josm.gui.conflict.pair.relation;
    33
    44import java.awt.Component;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

    r1938 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.relation;
     2package org.openstreetmap.josm.gui.conflict.pair.relation;
    33
    44import java.awt.Color;
     
    1818import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1919import org.openstreetmap.josm.data.osm.RelationMember;
    20 import org.openstreetmap.josm.gui.conflict.ListMergeModel;
     20import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
    2121import org.openstreetmap.josm.tools.ImageProvider;
    2222
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java

    r1654 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    66import java.awt.Color;
    77
    8 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     8import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    99
    1010public class MergedTableCellRenderer extends TagMergeTableCellRenderer {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java

    r1654 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import java.awt.Color;
    55
    6 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     6import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    77
    88import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java

    r1622 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

    r1843 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    66import org.openstreetmap.josm.data.osm.OsmPrimitive;
    7 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     7import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    88
    99/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

    r1654 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import java.beans.PropertyChangeEvent;
     
    1313import org.openstreetmap.josm.command.TagConflictResolveCommand;
    1414import org.openstreetmap.josm.data.osm.OsmPrimitive;
    15 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     15import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    1616
    1717/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

    r1626 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import java.awt.Color;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

    r1654 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2626import javax.swing.event.ListSelectionListener;
    2727
    28 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     28import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    2929import org.openstreetmap.josm.tools.ImageProvider;
    3030/**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

    r1654 r1954  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.conflict.pair.tags;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    66import java.awt.Color;
    77
    8 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     8import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    99
    1010public class TheirTableCellRenderer extends TagMergeTableCellRenderer {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

    r1904 r1954  
    2727import org.openstreetmap.josm.gui.OptionPaneUtil;
    2828import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    29 import org.openstreetmap.josm.gui.conflict.ConflictResolver;
    30 import org.openstreetmap.josm.gui.conflict.properties.OperationCancelledException;
     29import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
     30import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
    3131import org.openstreetmap.josm.tools.ImageProvider;
    3232
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r1935 r1954  
    99import java.awt.Point;
    1010import java.awt.event.ActionEvent;
    11 import java.awt.event.FocusEvent;
    12 import java.awt.event.FocusListener;
    1311import java.awt.event.KeyEvent;
    1412import java.awt.event.MouseAdapter;
     
    2321
    2422import javax.swing.AbstractAction;
    25 import javax.swing.Action;
    2623import javax.swing.DefaultListCellRenderer;
    2724import javax.swing.DefaultListModel;
     
    273270     */
    274271    public final  class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating {
    275 
    276 
    277 
    278272        private  Layer layer;
    279273
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java

    r1910 r1954  
    88import org.openstreetmap.josm.data.osm.Node;
    99import org.openstreetmap.josm.data.osm.Way;
     10import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
    1011
    1112public class NodeListMergerTest extends JFrame {
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java

    r1707 r1954  
    1010import org.openstreetmap.josm.data.osm.Node;
    1111import org.openstreetmap.josm.data.projection.Epsg4326;
     12import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
    1213
    1314public class PropertiesMergerTest extends JFrame{
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java

    r1951 r1954  
    1010import org.openstreetmap.josm.data.osm.RelationMember;
    1111import org.openstreetmap.josm.data.osm.Way;
     12import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
    1213
    1314public class RelationMemberMergerTest extends JFrame {
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java

    r1707 r1954  
    66import javax.swing.JFrame;
    77
    8 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
    9 import org.openstreetmap.josm.gui.conflict.tags.TagMerger;
     8import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
     9import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;
    1010
    1111public class TagMergerTest extends JFrame {
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java

    r1910 r1954  
    1818import org.openstreetmap.josm.data.osm.Node;
    1919import org.openstreetmap.josm.data.osm.Way;
     20import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
    2021
    2122public class NodeListMergeModelTest {
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

    r1703 r1954  
    1717import org.openstreetmap.josm.data.osm.Way;
    1818import org.openstreetmap.josm.data.projection.Epsg4326;
    19 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     19import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     20import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
    2021
    2122public class PropertiesMergeModelTest {
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java

    r1654 r1954  
    44import org.junit.*;
    55import org.openstreetmap.josm.data.osm.Node;
    6 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
    7 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
     6import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     7import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
    88
    99import static org.junit.Assert.*;
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

    r1654 r1954  
    1212import org.junit.Test;
    1313import org.openstreetmap.josm.data.osm.Node;
    14 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     14import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     15import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
     16import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
    1517
    1618public class TagMergeModelTest {
Note: See TracChangeset for help on using the changeset viewer.