Changeset 12661 in josm for trunk/src


Ignore:
Timestamp:
2017-08-26T01:08:10+02:00 (7 years ago)
Author:
michael2402
Message:

Fix #14794: Add javadoc for gui/conflict/pair package.

Location:
trunk/src/org/openstreetmap/josm/gui/conflict/pair
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

    r12620 r12661  
    7575 * @param <C> the type of conflict resolution command
    7676 * @see AbstractListMerger
     77 * @see PairTable For the table displaying this model
    7778 */
    7879public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends ConflictResolveCommand> extends ChangeNotifier {

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java

    r7001 r12661  
    1010import org.openstreetmap.josm.gui.conflict.ConflictColors;
    1111
     12/**
     13 * This {@link ListCellRenderer} renders the value of a {@link ComparePairType}
     14 */
    1215public class ComparePairListCellRenderer extends JLabel implements ListCellRenderer<ComparePairType> {
    1316

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

    r9440 r12661  
    44import org.openstreetmap.josm.data.conflict.Conflict;
    55import org.openstreetmap.josm.data.osm.OsmPrimitive;
     6import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
    67
     8/**
     9 * The conflict resolver receives the result of a {@link ConflictDialog}. It should then apply the resulution the user selected.
     10 */
    711public interface IConflictResolver {
    812

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java

    r3083 r12661  
    22package org.openstreetmap.josm.gui.conflict.pair;
    33
     4import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType;
     5
     6/**
     7 * This is the merge decision for a primitive.
     8 *
     9 * @see RelationMemberConflictDecisionType the same for relation members
     10 */
    411public enum MergeDecisionType {
    512    KEEP_MINE,

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java

    r11330 r12661  
    1313import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
    1414
     15/**
     16 * This is the base class for all tables that display an {@link AbstractListMergeModel}.
     17 */
    1518public abstract class PairTable extends OsmPrimitivesTable {
    1619

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java

    r8513 r12661  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import javax.swing.table.TableCellRenderer;
     7
    68import org.openstreetmap.josm.gui.conflict.ConflictColors;
    79import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    810
     11/**
     12 * This {@link TableCellRenderer} displays the decision a user made regarding a tag conflict
     13 */
    914public class MergedTableCellRenderer extends TagMergeTableCellRenderer {
    1015    protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java

    r8510 r12661  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import javax.swing.table.TableCellRenderer;
     7
    68import org.openstreetmap.josm.gui.conflict.ConflictColors;
    79import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    810
     11/**
     12 * This {@link TableCellRenderer} renders the mine side of the tag conflict table.
     13 */
    914public class MineTableCellRenderer extends TagMergeTableCellRenderer {
    1015

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

    r8510 r12661  
    1111import org.openstreetmap.josm.gui.conflict.ConflictColors;
    1212
     13/**
     14 * This is the base class for all cells in the {@link TagMerger}.
     15 */
    1316public abstract class TagMergeTableCellRenderer extends JLabel implements TableCellRenderer {
    1417

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

    r8510 r12661  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import javax.swing.table.TableCellRenderer;
     7
    68import org.openstreetmap.josm.gui.conflict.ConflictColors;
    79import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    810
     11/**
     12 * This {@link TableCellRenderer} renders the theirs side of the tag conflict table.
     13 */
    914public class TheirTableCellRenderer extends TagMergeTableCellRenderer {
    1015
Note: See TracChangeset for help on using the changeset viewer.