Changeset 4163 in josm


Ignore:
Timestamp:
2011-06-24T23:20:07+02:00 (10 years ago)
Author:
stoecker
Message:

improve color names of last checkin

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

    r4162 r4163  
    1515    BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217,255,217)),
    1616    BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255,197,197)),
    17     BGCOLOR_MINE(marktr("Conflict background: mine"), Color.white),
    18     BGCOLOR_THEIR(marktr("Conflict background: their"), new Color(217,255,217)),
     17    BGCOLOR_DROP(marktr("Conflict background: drop"), Color.white),
     18    BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217,255,217)),
    1919    BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217,255,217)),
    2020    BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143,170,255)),
    2121
    2222    FGCOLOR_UNDECIDED(marktr("Conflict foreground: undecided"), Color.black),
    23     FGCOLOR_MINE(marktr("Conflict foreground: mine"), Color.lightGray),
    24     FGCOLOR_THEIR(marktr("Conflict foreground: their"), Color.black),
     23    FGCOLOR_DROP(marktr("Conflict foreground: drop"), Color.lightGray),
     24    FGCOLOR_KEEP(marktr("Conflict foreground: keep"), Color.black),
    2525
    2626    BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234,234,234)),
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java

    r4162 r4163  
    88
    99public class MineTableCellRenderer extends TagMergeTableCellRenderer {
    10     /* NOTE: mine and their colors are reversed for this renderer */
    1110
    1211    protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
    13         if (isSelected)  {
     12        if (isSelected) {
    1413            setBackground(ConflictColors.BGCOLOR_SELECTED.get());
    1514            return;
    1615        }
    17 
    1816        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
    19             setBackground(ConflictColors.BGCOLOR_THEIR.get());
     17            setBackground(ConflictColors.BGCOLOR_KEEP.get());
    2018        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
    21             setBackground(ConflictColors.BGCOLOR_MINE.get());
     19            setBackground(ConflictColors.BGCOLOR_DROP.get());
    2220        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
    2321            setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
     
    2725    protected void setTextColor(TagMergeItem item) {
    2826        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
    29             setForeground(ConflictColors.FGCOLOR_THEIR.get());
     27            setForeground(ConflictColors.FGCOLOR_KEEP.get());
    3028        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
    31             setForeground(ConflictColors.FGCOLOR_MINE.get());
     29            setForeground(ConflictColors.FGCOLOR_DROP.get());
    3230        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
    3331            setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
     
    3735    @Override
    3836    protected void renderKey(TagMergeItem item, boolean isSelected) {
    39         setBackgroundColor(item,isSelected);
     37        setBackgroundColor(item, isSelected);
    4038        setTextColor(item);
    4139        if (item.getMyTagValue() == null) {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

    r4162 r4163  
    1515        }
    1616        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
    17             setBackground(ConflictColors.BGCOLOR_MINE.get());
     17            setBackground(ConflictColors.BGCOLOR_DROP.get());
    1818        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
    19             setBackground(ConflictColors.BGCOLOR_THEIR.get());
     19            setBackground(ConflictColors.BGCOLOR_KEEP.get());
    2020        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
    2121            setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
     
    2424
    2525    protected void setTextColor(TagMergeItem item) {
    26         if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
    27             setForeground(ConflictColors.FGCOLOR_THEIR.get());
    28         } else if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
    29             setForeground(ConflictColors.FGCOLOR_MINE.get());
     26        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
     27            setForeground(ConflictColors.FGCOLOR_DROP.get());
     28        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
     29            setForeground(ConflictColors.FGCOLOR_KEEP.get());
    3030        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
    3131            setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
Note: See TracChangeset for help on using the changeset viewer.