Ignore:
Timestamp:
2015-06-20T23:42:21+02:00 (9 years ago)
Author:
Don-vip
Message:

checkstyle: enable relevant whitespace checks and fix them

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

Legend:

Unmodified
Added
Removed

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

    r7937 r8510  
    1111public enum ConflictColors implements ColorKey {
    1212
    13     BGCOLOR_NO_CONFLICT(marktr("Conflict background: no conflict"), new Color(234,234,234)),
    14     BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217,255,217)),
    15     BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255,197,197)),
     13    BGCOLOR_NO_CONFLICT(marktr("Conflict background: no conflict"), new Color(234, 234, 234)),
     14    BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217, 255, 217)),
     15    BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255, 197, 197)),
    1616    BGCOLOR_DROP(marktr("Conflict background: drop"), Color.white),
    17     BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217,255,217)),
    18     BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217,255,217)),
    19     BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143,170,255)),
     17    BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217, 255, 217)),
     18    BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217, 255, 217)),
     19    BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143, 170, 255)),
    2020
    2121    FGCOLOR_UNDECIDED(marktr("Conflict foreground: undecided"), Color.black),
    … …  
    2323    FGCOLOR_KEEP(marktr("Conflict foreground: keep"), Color.black),
    2424
    25     BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234,234,234)),
    26     BGCOLOR_FROZEN(marktr("Conflict background: frozen"), new Color(234,234,234)),
     25    BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234, 234, 234)),
     26    BGCOLOR_FROZEN(marktr("Conflict background: frozen"), new Color(234, 234, 234)),
    2727    BGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict background: in comparison"), Color.black),
    2828    FGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict foreground: in comparison"), Color.white),
    … …  
    3030    FGCOLOR(marktr("Conflict foreground"), Color.black),
    3131
    32     BGCOLOR_NOT_IN_OPPOSITE(marktr("Conflict background: not in opposite"), new Color(255,197,197)),
    33     BGCOLOR_IN_OPPOSITE(marktr("Conflict background: in opposite"), new Color(255,234,213)),
    34     BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217,255,217)),
     32    BGCOLOR_NOT_IN_OPPOSITE(marktr("Conflict background: not in opposite"), new Color(255, 197, 197)),
     33    BGCOLOR_IN_OPPOSITE(marktr("Conflict background: in opposite"), new Color(255, 234, 213)),
     34    BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)),
    3535
    36     BGCOLOR_TAG_KEEP_ONE (marktr("Conflict background: keep one tag"), new Color(217,255,217)),
     36    BGCOLOR_TAG_KEEP_ONE (marktr("Conflict background: keep one tag"), new Color(217, 255, 217)),
    3737    FGCOLOR_TAG_KEEP_ONE (marktr("Conflict foreground: keep one tag"), Color.black),
    3838    BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray),
    3939    FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black),
    40     BGCOLOR_TAG_KEEP_ALL (marktr("Conflict background: keep all tags"), new Color(255,234,213)),
     40    BGCOLOR_TAG_KEEP_ALL (marktr("Conflict background: keep all tags"), new Color(255, 234, 213)),
    4141    FGCOLOR_TAG_KEEP_ALL (marktr("Conflict foreground: keep all tags"), Color.black),
    42     BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255,234,213)),
     42    BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)),
    4343    FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black),
    4444
    45     BGCOLOR_MEMBER_KEEP  (marktr("Conflict background: keep member"), new Color(217,255,217)),
     45    BGCOLOR_MEMBER_KEEP  (marktr("Conflict background: keep member"), new Color(217, 255, 217)),
    4646    FGCOLOR_MEMBER_KEEP  (marktr("Conflict foreground: keep member"), Color.black),
    4747    BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray),

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

    r8509 r8510  
    171171    public void propertyChange(PropertyChangeEvent evt) {
    172172        if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) {
    173             int newValue = (Integer)evt.getNewValue();
     173            int newValue = (Integer) evt.getNewValue();
    174174            if (newValue == 0) {
    175175                tabbedPane.setTitleAt(1, tr("Tags"));
    … …  
    184184            updateResolvedCompletely();
    185185        } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
    186             boolean frozen = (Boolean)evt.getNewValue();
     186            boolean frozen = (Boolean) evt.getNewValue();
    187187            if (evt.getSource() == nodeListMerger.getModel() && my instanceof Way) {
    188188                if (frozen) {
    … …  
    192192                } else {
    193193                    tabbedPane.setTitleAt(2, tr("Nodes(with conflicts)"));
    194                     tabbedPane.setToolTipTextAt(2,tr("Pending conflicts in the node list of this way"));
     194                    tabbedPane.setToolTipTextAt(2, tr("Pending conflicts in the node list of this way"));
    195195                    tabbedPane.setIconAt(2, mergeIncomplete);
    196196                }
    … …  
    208208            updateResolvedCompletely();
    209209        } else if (evt.getPropertyName().equals(PropertiesMergeModel.RESOLVED_COMPLETELY_PROP)) {
    210             boolean resolved = (Boolean)evt.getNewValue();
     210            boolean resolved = (Boolean) evt.getNewValue();
    211211            if (resolved) {
    212212                tabbedPane.setTitleAt(0, tr("Properties"));
    … …  
    242242
    243243        if (my instanceof Node) {
    244             tabbedPane.setEnabledAt(2,false);
    245             tabbedPane.setEnabledAt(3,false);
     244            tabbedPane.setEnabledAt(2, false);
     245            tabbedPane.setEnabledAt(3, false);
    246246        } else if (my instanceof Way) {
    247247            nodeListMerger.populate(conflict);
    248248            tabbedPane.setEnabledAt(2, true);
    249249            tabbedPane.setEnabledAt(3, false);
    250             tabbedPane.setTitleAt(3,tr("Members"));
     250            tabbedPane.setTitleAt(3, tr("Members"));
    251251            tabbedPane.setIconAt(3, null);
    252252        } else if (my instanceof Relation) {
    253253            relationMemberMerger.populate(conflict);
    254254            tabbedPane.setEnabledAt(2, false);
    255             tabbedPane.setTitleAt(2,tr("Nodes"));
     255            tabbedPane.setTitleAt(2, tr("Nodes"));
    256256            tabbedPane.setIconAt(2, null);
    257257            tabbedPane.setEnabledAt(3, true);

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

    r5170 r8510  
    88
    99    void deletePrimitive(boolean deleted);
     10
    1011    void populate(Conflict<? extends OsmPrimitive> conflict);
    11 
    1212}

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

    r8470 r8510  
    139139            PrimitiveId id = mergedMap.get(entry);
    140140            if (id == null && entry instanceof OsmPrimitive) {
    141                 id = mergedMap.get(((OsmPrimitive)entry).getPrimitiveId());
     141                id = mergedMap.get(((OsmPrimitive) entry).getPrimitiveId());
    142142            }
    143143            if (id != null) {
    … …  
    208208
    209209    public void addPropertyChangeListener(PropertyChangeListener listener) {
    210         synchronized(listeners) {
     210        synchronized (listeners) {
    211211            if (listener != null && !listeners.contains(listener)) {
    212212                listeners.add(listener);
    … …  
    216216
    217217    public void removePropertyChangeListener(PropertyChangeListener listener) {
    218         synchronized(listeners) {
     218        synchronized (listeners) {
    219219            if (listener != null && listeners.contains(listener)) {
    220220                listeners.remove(listener);
    … …  
    224224
    225225    protected void fireFrozenChanged(boolean oldValue, boolean newValue) {
    226         synchronized(listeners) {
     226        synchronized (listeners) {
    227227            PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
    228228            for (PropertyChangeListener listener: listeners) {
    … …  
    355355    protected void alertCopyFailedForDeletedPrimitives(List<PrimitiveId> deletedIds) {
    356356        List<String> items = new ArrayList<>();
    357         for (int i=0; i<Math.min(MAX_DELETED_PRIMITIVE_IN_DIALOG, deletedIds.size()); i++) {
     357        for (int i = 0; i < Math.min(MAX_DELETED_PRIMITIVE_IN_DIALOG, deletedIds.size()); i++) {
    358358            items.add(deletedIds.get(i).toString());
    359359        }
    … …  
    402402
    403403        int[] rows = new int[entries.get(source).size()];
    404         for (int i=0; i<rows.length; i++) {
     404        for (int i = 0; i < rows.length; i++) {
    405405            rows[i] = i;
    406406        }
    … …  
    525525            // can't move down
    526526            return;
    527         for (int i = rows.length-1; i>=0;i--) {
     527        for (int i = rows.length-1; i >= 0; i--) {
    528528            int row = rows[i];
    529529            T n = mergedEntries.get(row);
    … …  
    551551        List<T> mergedEntries = getMergedEntries();
    552552
    553         for (int i = rows.length-1; i>=0;i--) {
     553        for (int i = rows.length-1; i >= 0; i--) {
    554554            mergedEntries.remove(rows[i]);
    555555        }
    … …  
    569569        if (getMyEntriesSize() != getTheirEntriesSize())
    570570            return false;
    571         for (int i=0; i < getMyEntriesSize(); i++) {
     571        for (int i = 0; i < getMyEntriesSize(); i++) {
    572572            if (!isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i)))
    573573                return false;
    … …  
    617617        @Override
    618618        public void setValueAt(Object value, int row, int col) {
    619             ListMergeModel.this.setValueAt(this, value,row,col);
     619            ListMergeModel.this.setValueAt(this, value, row, col);
    620620        }
    621621
    … …  
    712712                return (OsmPrimitive) value;
    713713            } else if (value instanceof RelationMember) {
    714                 return ((RelationMember)value).getMember();
     714                return ((RelationMember) value).getMember();
    715715            } else {
    716716                Main.error("Unknown object type: "+value);

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

    r8509 r8510  
    8282
    8383    protected abstract JScrollPane buildMyElementsTable();
     84
    8485    protected abstract JScrollPane buildMergedElementsTable();
     86
    8587    protected abstract JScrollPane buildTheirElementsTable();
    8688
    … …  
    268270        gc.weightx = 0.0;
    269271        gc.weighty = 0.0;
    270         gc.insets = new Insets(10,0,0,0);
     272        gc.insets = new Insets(10, 0, 0, 0);
    271273        lblMyVersion = new JLabel(tr("My version"));
    272274        lblMyVersion.setToolTipText(tr("List of elements in my dataset, i.e. the local dataset"));
    … …  
    295297        gc.weightx = 0.33;
    296298        gc.weighty = 0.0;
    297         gc.insets = new Insets(0,0,0,0);
     299        gc.insets = new Insets(0, 0, 0, 0);
    298300        JCheckBox cbLockMyScrolling = new JCheckBox();
    299301        cbLockMyScrolling.setName("checkbox.lockmyscrolling");
    … …  
    321323        gc.weightx = 0.33;
    322324        gc.weighty = 1.0;
    323         gc.insets = new Insets(0,0,0,0);
     325        gc.insets = new Insets(0, 0, 0, 0);
    324326        JScrollPane pane = buildMyElementsTable();
    325327        lblMyVersion.setLabelFor(pane);
    … …  
    809811                        public void propertyChange(PropertyChangeEvent evt) {
    810812                            if (evt.getPropertyName().equals(PROP_SELECTED)) {
    811                                 btn.setSelected((Boolean)evt.getNewValue());
     813                                btn.setSelected((Boolean) evt.getNewValue());
    812814                            }
    813815                        }
    … …  
    828830                model.setFrozen(false);
    829831            }
    830             boolean isSelected = (Boolean)getValue(PROP_SELECTED);
     832            boolean isSelected = (Boolean) getValue(PROP_SELECTED);
    831833            if (isSelected != (e.getStateChange() == ItemEvent.SELECTED)) {
    832834                putValue(PROP_SELECTED, e.getStateChange() == ItemEvent.SELECTED);
    … …  
    860862    public void propertyChange(PropertyChangeEvent evt) {
    861863        if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
    862             handlePropertyChangeFrozen((Boolean)evt.getOldValue(), (Boolean)evt.getNewValue());
     864            handlePropertyChangeFrozen((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue());
    863865        }
    864866    }

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

    r8426 r8510  
    5959    @Override
    6060    public void populate(Conflict<? extends OsmPrimitive> conflict) {
    61         Way myWay = (Way)conflict.getMy();
    62         Way theirWay = (Way)conflict.getTheir();
    63         ((NodeListMergeModel)model).populate(myWay, theirWay, conflict.getMergedMap());
     61        Way myWay = (Way) conflict.getMy();
     62        Way theirWay = (Way) conflict.getTheir();
     63        ((NodeListMergeModel) model).populate(myWay, theirWay, conflict.getMergedMap());
    6464        myEntriesTable.setLayer(findLayerFor(myWay));
    6565        theirEntriesTable.setLayer(findLayerFor(theirWay));

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

    r8444 r8510  
    3232    public NodeListTableCellRenderer() {
    3333        icon = ImageProvider.get("data", "node");
    34         rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
     34        rowNumberBorder = BorderFactory.createEmptyBorder(0, 4, 0, 0);
    3535        setOpaque(true);
    3636    }
    … …  
    104104            int row, int column) {
    105105
    106         Node node = (Node)value;
     106        Node node = (Node) value;
    107107        reset();
    108108        if (node == null) {
    … …  
    111111            switch(column) {
    112112            case 0:
    113                 renderRowId(getModel(table),row, isSelected);
     113                renderRowId(getModel(table), row, isSelected);
    114114                break;
    115115            case 1:
    … …  
    126126    /**
    127127     * replies the model
    128      * @param table  the table
     128     * @param table the table
    129129     * @return the table model
    130130     */
    131131    @SuppressWarnings("unchecked")
    132132    protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
    133         return (ListMergeModel<Node>.EntriesTableModel)table.getModel();
     133        return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
    134134    }
    135135}

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

    r8444 r8510  
    128128        OsmPrimitive their = conflict.getTheir();
    129129        if (my instanceof Node) {
    130             myCoords = ((Node)my).getCoor();
    131             theirCoords = ((Node)their).getCoor();
     130            myCoords = ((Node) my).getCoor();
     131            theirCoords = ((Node) their).getCoor();
    132132        } else {
    133133            myCoords = null;
    … …  
    138138        theirDeletedState = their.isDeleted();
    139139
    140         myReferrers = my.getDataSet() == null?Collections.<OsmPrimitive>emptyList():my.getReferrers();
    141         theirReferrers = their.getDataSet() == null?Collections.<OsmPrimitive>emptyList():their.getReferrers();
     140        myReferrers = my.getDataSet() == null ? Collections.<OsmPrimitive>emptyList() : my.getReferrers();
     141        theirReferrers = their.getDataSet() == null ? Collections.<OsmPrimitive>emptyList() : their.getReferrers();
    142142
    143143        coordMergeDecision = UNDECIDED;

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

    r8509 r8510  
    7878        gc.weightx = 0.0;
    7979        gc.weighty = 0.0;
    80         gc.insets = new Insets(10,0,10,0);
     80        gc.insets = new Insets(10, 0, 10, 0);
    8181        JLabel lblMyVersion = new JLabel(tr("My version"));
    8282        lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
    … …  
    108108        gc.weightx = 0.0;
    109109        gc.weighty = 0.0;
    110         gc.insets = new Insets(0,5,0,5);
     110        gc.insets = new Insets(0, 5, 0, 5);
    111111        add(new JLabel(tr("Coordinates:")), gc);
    112112
    … …  
    182182        gc.weightx = 0.0;
    183183        gc.weighty = 0.0;
    184         gc.insets = new Insets(0,5,0,5);
     184        gc.insets = new Insets(0, 5, 0, 5);
    185185        add(new JLabel(tr("Deleted State:")), gc);
    186186
    … …  
    258258        gc.weightx = 0.0;
    259259        gc.weighty = 0.0;
    260         gc.insets = new Insets(0,5,0,5);
     260        gc.insets = new Insets(0, 5, 0, 5);
    261261        add(new JLabel(tr("Referenced by:")), gc);
    262262

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

    r8465 r8510  
    4848        if (model == getMergedTableModel() && col == 1) {
    4949            RelationMember memberOld = getMergedEntries().get(row);
    50             RelationMember memberNew = new RelationMember((String)value,memberOld.getMember());
     50            RelationMember memberNew = new RelationMember((String) value, memberOld.getMember());
    5151            getMergedEntries().remove(row);
    52             getMergedEntries().add(row,memberNew);
     52            getMergedEntries().add(row, memberNew);
    5353            fireModelDataChanged();
    5454        }

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

    r8426 r8510  
    6060    @Override
    6161    public void populate(Conflict<? extends OsmPrimitive> conflict) {
    62         Relation myRel = (Relation)conflict.getMy();
    63         Relation theirRel = (Relation)conflict.getTheir();
    64         ((RelationMemberListMergeModel)model).populate(myRel, theirRel, conflict.getMergedMap());
     62        Relation myRel = (Relation) conflict.getMy();
     63        Relation theirRel = (Relation) conflict.getTheir();
     64        ((RelationMemberListMergeModel) model).populate(myRel, theirRel, conflict.getMergedMap());
    6565        myEntriesTable.setLayer(findLayerFor(myRel));
    6666        theirEntriesTable.setLayer(findLayerFor(theirRel));

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

    r6912 r8510  
    4242            return null;
    4343
    44         RelationMember member = (RelationMember)value;
     44        RelationMember member = (RelationMember) value;
    4545
    4646        editor.setText(member.getRole());

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

    r8444 r8510  
    3131        setIcon(null);
    3232        setOpaque(true);
    33         rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
     33        rowNumberBorder = BorderFactory.createEmptyBorder(0, 4, 0, 0);
    3434    }
    3535
    … …  
    116116            int row, int column) {
    117117
    118         RelationMember member = (RelationMember)value;
     118        RelationMember member = (RelationMember) value;
    119119        reset();
    120120        if (member == null) {
    … …  
    147147    @SuppressWarnings("unchecked")
    148148    protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
    149         return (ListMergeModel<Node>.EntriesTableModel)table.getModel();
     149        return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
    150150    }
    151151}

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

    r4162 r8510  
    2424    @Override
    2525    protected void renderKey(TagMergeItem item, boolean isSelected) {
    26         setBackgroundColor(item,isSelected);
     26        setBackgroundColor(item, isSelected);
    2727        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
    2828            setText(tr("<undefined>"));
    … …  
    4141    @Override
    4242    protected void renderValue(TagMergeItem item, boolean isSelected) {
    43         setBackgroundColor(item,isSelected);
     43        setBackgroundColor(item, isSelected);
    4444        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
    4545            setText(tr("<undefined>"));

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

    r4163 r8510  
    4848    @Override
    4949    protected void renderValue(TagMergeItem item, boolean isSelected) {
    50         setBackgroundColor(item,isSelected);
     50        setBackgroundColor(item, isSelected);
    5151        setTextColor(item);
    5252        if (item.getMyTagValue() == null) {

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

    r8444 r8510  
    4949
    5050    public void addPropertyChangeListener(PropertyChangeListener listener) {
    51         synchronized(listeners) {
     51        synchronized (listeners) {
    5252            if (listener == null) return;
    5353            if (listeners.contains(listener)) return;
    … …  
    5757
    5858    public void removePropertyChangeListener(PropertyChangeListener listener) {
    59         synchronized(listeners) {
     59        synchronized (listeners) {
    6060            if (listener == null) return;
    6161            if (!listeners.contains(listener)) return;
    … …  
    7171     */
    7272    protected void fireNumUndecidedTagsChanged(int oldValue, int newValue) {
    73         PropertyChangeEvent evt = new PropertyChangeEvent(this,PROP_NUM_UNDECIDED_TAGS,oldValue, newValue);
    74         synchronized(listeners) {
    75             for(PropertyChangeListener l : listeners) {
     73        PropertyChangeEvent evt = new PropertyChangeEvent(this, PROP_NUM_UNDECIDED_TAGS, oldValue, newValue);
     74        synchronized (listeners) {
     75            for (PropertyChangeListener l : listeners) {
    7676                l.propertyChange(evt);
    7777            }
    … …  
    8585     */
    8686    protected void refreshNumUndecidedTags() {
    87         int newValue=0;
    88         for(TagMergeItem item: tagMergeItems) {
     87        int newValue = 0;
     88        for (TagMergeItem item: tagMergeItems) {
    8989            if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
    9090                newValue++;
    … …  
    110110        keys.addAll(my.keySet());
    111111        keys.addAll(their.keySet());
    112         for(String key : keys) {
     112        for (String key : keys) {
    113113            String myValue = my.get(key);
    114114            String theirValue = their.get(key);
    … …  
    214214
    215215    public int getFirstUndecided(int startIndex) {
    216         for (int i=startIndex; i<tagMergeItems.size(); i++) {
     216        for (int i = startIndex; i < tagMergeItems.size(); i++) {
    217217            if (tagMergeItems.get(i).getMergeDecision() == MergeDecisionType.UNDECIDED)
    218218                return i;

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

    r8444 r8510  
    3131            return this;
    3232
    33         TagMergeItem item = (TagMergeItem)value;
     33        TagMergeItem item = (TagMergeItem) value;
    3434        switch(col) {
    3535        case 0:
    … …  
    4545        return this;
    4646    }
    47 
    4847}

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

    r8426 r8510  
    131131        gc.weightx = 0.0;
    132132        gc.weighty = 0.0;
    133         gc.insets = new Insets(10,0,10,0);
     133        gc.insets = new Insets(10, 0, 10, 0);
    134134        JLabel lblMy = new JLabel(tr("My version (local dataset)"));
    135135        add(lblMy, gc);
    … …  
    154154        gc.weightx = 0.0;
    155155        gc.weighty = 0.0;
    156         gc.insets = new Insets(0,0,0,0);
     156        gc.insets = new Insets(0, 0, 0, 0);
    157157        JLabel lblTheir = new JLabel(tr("Their version (server dataset)"));
    158158        add(lblTheir, gc);
    … …  
    429429    public void deletePrimitive(boolean deleted) {
    430430        // Use my entries, as it doesn't really matter
    431         MergeDecisionType decision = deleted?MergeDecisionType.KEEP_MINE:MergeDecisionType.UNDECIDED;
    432         for (int i=0; i<model.getRowCount(); i++) {
     431        MergeDecisionType decision = deleted ? MergeDecisionType.KEEP_MINE : MergeDecisionType.UNDECIDED;
     432        for (int i = 0; i < model.getRowCount(); i++) {
    433433            model.decide(i, decision);
    434434        }

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

    r4163 r8510  
    4848    @Override
    4949    protected void renderValue(TagMergeItem item, boolean isSelected) {
    50         setBackgroundColor(item,isSelected);
     50        setBackgroundColor(item, isSelected);
    5151        setTextColor(item);
    5252        if (item.getTheirTagValue() == null) {

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

    r8509 r8510  
    280280            cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
    281281        }
    282         for(String p : OsmPrimitive.getDiscardableKeys()) {
     282        for (String p : OsmPrimitive.getDiscardableKeys()) {
    283283            if (targetPrimitive.get(p) != null) {
    284284                cmds.add(new ChangePropertyCommand(targetPrimitive, p, null));

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

    r8444 r8510  
    122122                    @Override
    123123                    public void itemStateChanged(ItemEvent e) {
    124                         if(e.getStateChange() == ItemEvent.SELECTED)
     124                        if (e.getStateChange() == ItemEvent.SELECTED)
    125125                            fireEditingStopped();
    126126                    }
    … …  
    175175    @Override
    176176    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
    177         MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value;
     177        MultiValueResolutionDecision decision = (MultiValueResolutionDecision) value;
    178178        initEditor(decision);
    179179        editor.requestFocus();

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

    r8509 r8510  
    149149            return this;
    150150
    151         MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value;
     151        MultiValueResolutionDecision decision = (MultiValueResolutionDecision) value;
    152152        TagConflictResolverModel tagModel = (TagConflictResolverModel) table.getModel();
    153153        boolean conflict = tagModel.getKeysWithConflicts().contains(tagModel.getKey(row));

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

    r8509 r8510  
    307307        case SUM_ALL_NUMERIC: return new Tag(getKey(), tags.getSummedValues(getKey()));
    308308        case KEEP_ALL: return new Tag(getKey(), tags.getJoinedValues(getKey()));
    309         case KEEP_ONE: return new Tag(getKey(),value);
     309        case KEEP_ONE: return new Tag(getKey(), value);
    310310        case KEEP_NONE: return new Tag(getKey(), "");
    311311        case UNDECIDED:

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

    r8509 r8510  
    146146     * @param targetStatistics histogram of paste targets, number of primitives of each type in the paste target
    147147     */
    148     protected void initResolver(OsmPrimitiveType type, TagCollection tc, Map<OsmPrimitiveType,Integer> targetStatistics) {
    149         resolvers.get(type).getModel().populate(tc,tc.getKeysWithMultipleValues());
     148    protected void initResolver(OsmPrimitiveType type, TagCollection tc, Map<OsmPrimitiveType, Integer> targetStatistics) {
     149        resolvers.get(type).getModel().populate(tc, tc.getKeysWithMultipleValues());
    150150        resolvers.get(type).getModel().prepareDefaultTagDecisions();
    151151        if (!tc.isEmpty() && targetStatistics.get(type) != null && targetStatistics.get(type) > 0) {
    … …  
    162162     */
    163163    public void populate(TagCollection tagsForAllPrimitives, Map<OsmPrimitiveType, Integer> sourceStatistics,
    164             Map<OsmPrimitiveType,Integer> targetStatistics) {
     164            Map<OsmPrimitiveType, Integer> targetStatistics) {
    165165        mode = Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY;
    166         tagsForAllPrimitives = tagsForAllPrimitives == null? new TagCollection() : tagsForAllPrimitives;
    167         sourceStatistics = sourceStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() :sourceStatistics;
     166        tagsForAllPrimitives = tagsForAllPrimitives == null ? new TagCollection() : tagsForAllPrimitives;
     167        sourceStatistics = sourceStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : sourceStatistics;
    168168        targetStatistics = targetStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : targetStatistics;
    169169
    170170        // init the resolver
    171171        //
    172         allPrimitivesResolver.getModel().populate(tagsForAllPrimitives,tagsForAllPrimitives.getKeysWithMultipleValues());
     172        allPrimitivesResolver.getModel().populate(tagsForAllPrimitives, tagsForAllPrimitives.getKeysWithMultipleValues());
    173173        allPrimitivesResolver.getModel().prepareDefaultTagDecisions();
    174174
    … …  
    192192
    193193    protected TagConflictResolver getResolver(int idx) {
    194         return (TagConflictResolver)tpResolvers.getComponentAt(idx);
     194        return (TagConflictResolver) tpResolvers.getComponentAt(idx);
    195195    }
    196196
    … …  
    205205     */
    206206    public void populate(TagCollection tagsForNodes, TagCollection tagsForWays, TagCollection tagsForRelations,
    207             Map<OsmPrimitiveType,Integer> sourceStatistics, Map<OsmPrimitiveType, Integer> targetStatistics) {
     207            Map<OsmPrimitiveType, Integer> sourceStatistics, Map<OsmPrimitiveType, Integer> targetStatistics) {
    208208        tagsForNodes = (tagsForNodes == null) ? new TagCollection() : tagsForNodes;
    209209        tagsForWays = (tagsForWays == null) ? new TagCollection() : tagsForWays;
    210210        tagsForRelations = (tagsForRelations == null) ? new TagCollection() : tagsForRelations;
    211211        if (tagsForNodes.isEmpty() && tagsForWays.isEmpty() && tagsForRelations.isEmpty()) {
    212             populate(null,null,null);
     212            populate(null, null, null);
    213213            return;
    214214        }
    215215        tpResolvers.removeAll();
    216         initResolver(OsmPrimitiveType.NODE,tagsForNodes, targetStatistics);
    217         initResolver(OsmPrimitiveType.WAY,tagsForWays, targetStatistics);
    218         initResolver(OsmPrimitiveType.RELATION,tagsForRelations, targetStatistics);
     216        initResolver(OsmPrimitiveType.NODE, tagsForNodes, targetStatistics);
     217        initResolver(OsmPrimitiveType.WAY, tagsForWays, targetStatistics);
     218        initResolver(OsmPrimitiveType.RELATION, tagsForRelations, targetStatistics);
    219219
    220220        pnlTagResolver.setLayout(new BorderLayout());
    … …  
    255255        }
    256256
    257         for (int i =0; i < getNumResolverTabs(); i++) {
     257        for (int i = 0; i < getNumResolverTabs(); i++) {
    258258            if (!getResolver(i).getModel().isResolvedCompletely()) {
    259259                tpResolvers.setSelectedIndex(i);
    … …  
    328328            new WindowGeometry(
    329329                    getClass().getName() + ".geometry",
    330                     WindowGeometry.centerOnScreen(new Dimension(400,300))
     330                    WindowGeometry.centerOnScreen(new Dimension(400, 300))
    331331            ).applySafe(this);
    332332        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
    … …  
    348348    public void propertyChange(PropertyChangeEvent evt) {
    349349        if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
    350             TagConflictResolverModel model = (TagConflictResolverModel)evt.getSource();
    351             for (int i=0; i < tpResolvers.getTabCount();i++) {
    352                 TagConflictResolver resolver = (TagConflictResolver)tpResolvers.getComponentAt(i);
     350            TagConflictResolverModel model = (TagConflictResolverModel) evt.getSource();
     351            for (int i = 0; i < tpResolvers.getTabCount(); i++) {
     352                TagConflictResolver resolver = (TagConflictResolver) tpResolvers.getComponentAt(i);
    353353                if (model == resolver.getModel()) {
    354354                    tpResolvers.setIconAt(i,
    355                             (Boolean)evt.getNewValue() ? iconResolved : iconUnresolved
     355                            (Boolean) evt.getNewValue() ? iconResolved : iconUnresolved
    356356
    357357                    );
    … …  
    445445            setFont(UIManager.getFont("Table.font"));
    446446        }
     447
    447448        protected void renderNumTags(StatisticsInfo info) {
    448449            if (info == null) return;
    … …  
    467468                String msg = "";
    468469                switch(type) {
    469                 case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
     470                case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives, numPrimitives); break;
    470471                case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
    471472                case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
    … …  
    496497            if (row == 0) {
    497498                setFont(getFont().deriveFont(Font.BOLD));
    498                 setText((String)value);
     499                setText((String) value);
    499500            } else {
    500501                StatisticsInfo info = (StatisticsInfo) value;

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

    r8509 r8510  
    2727        this.pos  = pos;
    2828        this.originalPrimitive = member.getMember();
    29         this.role = member.hasRole()? member.getRole() : "";
     29        this.role = member.hasRole() ? member.getRole() : "";
    3030        this.decision = UNDECIDED;
    3131    }

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

    r8308 r8510  
    3030    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
    3131        setSelectedItem(value);
    32         this.originalValue = (RelationMemberConflictDecisionType)value;
     32        this.originalValue = (RelationMemberConflictDecisionType) value;
    3333        return this;
    3434    }

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

    r8509 r8510  
    5555            setForeground(UIManager.getColor("Table.selectionForeground"));
    5656        }
    57         RelationMemberConflictDecisionType decision = (RelationMemberConflictDecisionType)value;
     57        RelationMemberConflictDecisionType decision = (RelationMemberConflictDecisionType) value;
    5858        cbDecisionTypes.setSelectedItem(decision);
    5959        return cbDecisionTypes;

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

    r7661 r8510  
    5757        gc.weighty = 0.0;
    5858        gc.weightx = 1.0;
    59         gc.insets = new Insets(5,5,5,5);
     59        gc.insets = new Insets(5, 5, 5, 5);
    6060        add(pnl, gc);
    6161
    … …  
    6363        gc.weighty = 1.0;
    6464        gc.fill = GridBagConstraints.BOTH;
    65         gc.insets = new Insets(0,0,0,0);
     65        gc.insets = new Insets(0, 0, 0, 0);
    6666        add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc);
    6767        pnl = new JPanel();
    … …  
    7272        gc.weighty = 0.0;
    7373        gc.fill = GridBagConstraints.HORIZONTAL;
    74         add(pnl,gc);
     74        add(pnl, gc);
    7575    }
    7676

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

    r8470 r8510  
    117117        switch(column) {
    118118        case 2: /* role */
    119             d.setRole((String)value);
     119            d.setRole((String) value);
    120120            break;
    121121        case 4: /* decision */
    122             d.decide((RelationMemberConflictDecisionType)value);
     122            d.decide((RelationMemberConflictDecisionType) value);
    123123            refresh();
    124124            break;
    … …  
    135135     */
    136136    protected void populate(Relation relation, OsmPrimitive primitive) {
    137         for (int i =0; i<relation.getMembersCount();i++) {
     137        for (int i = 0; i < relation.getMembersCount(); i++) {
    138138            if (relation.getMember(i).refersTo(primitive)) {
    139139                decisions.add(new RelationMemberConflictDecision(relation, i));
    … …  
    155155        for (Relation r : relations) {
    156156            for (OsmPrimitive p: memberPrimitives) {
    157                 populate(r,p);
     157                populate(r, p);
    158158            }
    159159        }
    … …  
    226226
    227227    protected RelationMemberConflictDecision getDecision(Relation relation, int pos) {
    228         for(RelationMemberConflictDecision decision: decisions) {
     228        for (RelationMemberConflictDecision decision: decisions) {
    229229            if (decision.matches(relation, pos)) return decision;
    230230        }
    … …  
    236236        modifiedRelation.setMembers(null);
    237237        boolean isChanged = false;
    238         for (int i=0; i < relation.getMembersCount(); i++) {
     238        for (int i = 0; i < relation.getMembersCount(); i++) {
    239239            final RelationMember member = relation.getMember(i);
    240240            RelationMemberConflictDecision decision = getDecision(relation, i);
    … …  
    244244                switch(decision.getDecision()) {
    245245                case KEEP:
    246                     final RelationMember newMember = new RelationMember(decision.getRole(),newPrimitive);
     246                    final RelationMember newMember = new RelationMember(decision.getRole(), newPrimitive);
    247247                    modifiedRelation.addMember(newMember);
    248248                    isChanged |= !member.equals(newMember);
    … …  
    281281
    282282    protected boolean isChanged(Relation relation, OsmPrimitive newPrimitive) {
    283         for (int i=0; i < relation.getMembersCount(); i++) {
     283        for (int i = 0; i < relation.getMembersCount(); i++) {
    284284            RelationMemberConflictDecision decision = getDecision(relation, i);
    285285            if (decision == null) {

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

    r7027 r8510  
    4040        getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
    4141
    42         setRowHeight((int)new JosmComboBox<String>().getPreferredSize().getHeight());
     42        setRowHeight((int) new JosmComboBox<String>().getPreferredSize().getHeight());
    4343    }
    4444

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

    r8413 r8510  
    3535        // remove irrelevant tags
    3636        //
    37         for(String key : OsmPrimitive.getDiscardableKeys()) {
     37        for (String key : OsmPrimitive.getDiscardableKeys()) {
    3838            tc.removeByKey(key);
    3939        }
    … …  
    8686            // in the conflict dialog if necessary
    8787            //
    88             tc.add(new Tag(key,""));
     88            tc.add(new Tag(key, ""));
    8989        }
    9090    }

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

    r6890 r8510  
    3434    protected JPanel buildInfoPanel() {
    3535        JPanel pnl = new JPanel();
    36         pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     36        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    3737        pnl.setLayout(new GridBagLayout());
    3838        GridBagConstraints gc = new GridBagConstraints();

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

    r8509 r8510  
    8787    public void rebuild() {
    8888        if (tags == null) return;
    89         for(String key: tags.getKeys()) {
     89        for (String key: tags.getKeys()) {
    9090            MultiValueResolutionDecision decision = new MultiValueResolutionDecision(tags.getTagsFor(key));
    9191            if (decisions.get(key) == null) {
    92                 decisions.put(key,decision);
     92                decisions.put(key, decision);
    9393            }
    9494        }
    … …  
    168168        MultiValueResolutionDecision decision = getDecision(row);
    169169        if (value instanceof String) {
    170             decision.keepOne((String)value);
     170            decision.keepOne((String) value);
    171171        } else if (value instanceof MultiValueDecisionType) {
    172             MultiValueDecisionType type = (MultiValueDecisionType)value;
     172            MultiValueDecisionType type = (MultiValueDecisionType) value;
    173173            switch(type) {
    174174            case KEEP_NONE:

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

    r7743 r8510  
    4040        getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
    4141
    42         ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListener(this);
     42        ((MultiValueCellEditor) getColumnModel().getColumn(2).getCellEditor()).addNavigationListener(this);
    4343
    44         setRowHeight((int)new JosmComboBox<String>().getPreferredSize().getHeight());
     44        setRowHeight((int) new JosmComboBox<String>().getPreferredSize().getHeight());
    4545    }
    4646
Note: See TracChangeset for help on using the changeset viewer.