Ignore:
Timestamp:
2015-05-22T01:39:47+02:00 (9 years ago)
Author:
Don-vip
Message:

code style - A close curly brace should be located at the beginning of a line

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8399 r8413  
    516516            final Popup staticPopup = newPopup;
    517517            if(this.popup != null) {
    518                 // If an old popup exists, remove it when the new popup has been
    519                 // drawn to keep flickering to a minimum
     518                // If an old popup exists, remove it when the new popup has been drawn to keep flickering to a minimum
    520519                final Popup staticOldPopup = this.popup;
    521520                EventQueue.invokeLater(new Runnable(){
    522                     @Override public void run() {
     521                    @Override
     522                    public void run() {
    523523                        staticPopup.show();
    524524                        staticOldPopup.hide();
    … …  
    528528                // There is no old popup
    529529                EventQueue.invokeLater(new Runnable(){
    530                      @Override public void run() { staticPopup.show(); }});
     530                     @Override
     531                     public void run() {
     532                         staticPopup.show();
     533                     }});
    531534            }
    532535            this.popupLabels = lbls;

  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8395 r8413  
    432432        double lat = cl.lat();
    433433        double lon = cl.lon();
    434         if(lat < b.getMinLat()) {changed = true; lat = b.getMinLat();
    435         } else if(lat > b.getMaxLat()) {changed = true; lat = b.getMaxLat(); }
    436         if(lon < b.getMinLon()) {changed = true; lon = b.getMinLon();
    437         } else if(lon > b.getMaxLon()) {changed = true; lon = b.getMaxLon(); }
    438         if(changed) {
     434        if (lat < b.getMinLat()) {
     435            changed = true;
     436            lat = b.getMinLat();
     437        } else if (lat > b.getMaxLat()) {
     438            changed = true;
     439            lat = b.getMaxLat();
     440        }
     441        if (lon < b.getMinLon()) {
     442            changed = true;
     443            lon = b.getMinLon();
     444        } else if (lon > b.getMaxLon()) {
     445            changed = true;
     446            lon = b.getMaxLon();
     447        }
     448        if (changed) {
    439449            newCenter = Projections.project(new LatLon(lat,lon));
    440450        }

  • trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

    r8390 r8413  
    414414
    415415            @Override
    416             public void focusGained(FocusEvent e) {/* irrelevant */}
     416            public void focusGained(FocusEvent e) {
     417                /* irrelevant */
     418            }
    417419
    418420            @Override

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

    r7005 r8413  
    1616public final class TagConflictResolutionUtil {
    1717
    18     /** no constructor, just static utility methods */
    19     private TagConflictResolutionUtil() {}
     18    private TagConflictResolutionUtil() {
     19        // no constructor, just static utility methods
     20    }
    2021
    2122    /**
    2223     * Normalizes the tags in the tag collection <code>tc</code> before resolving tag conflicts.
    2324     *
    24      *  Removes irrelevant tags like "created_by".
     25     * Removes irrelevant tags like "created_by".
    2526     *
    26      *  For tags which are not present on at least one of the merged nodes, the empty value ""
    27      *  is added to the list of values for this tag, but only if there are at least two
    28      *  primitives with tags, and at least one tagged primitive do not have this tag.
     27     * For tags which are not present on at least one of the merged nodes, the empty value ""
     28     * is added to the list of values for this tag, but only if there are at least two
     29     * primitives with tags, and at least one tagged primitive do not have this tag.
    2930     *
    3031     * @param tc the tag collection

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r8318 r8413  
    640640
    641641    @Override
    642     public void nodeMoved(NodeMovedEvent event) {/* irrelevant in this context */}
    643 
    644     @Override
    645     public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
     642    public void nodeMoved(NodeMovedEvent event) {
     643        /* irrelevant in this context */
     644    }
     645
     646    @Override
     647    public void wayNodesChanged(WayNodesChangedEvent event) {
     648        /* irrelevant in this context */
     649    }
    646650
    647651    @Override

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r8378 r8413  
    393393
    394394    @Override
    395     public void layerAdded(Layer newLayer) {}
     395    public void layerAdded(Layer newLayer) {
     396        // Do nothing
     397    }
    396398
    397399    @Override

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

    r6084 r8413  
    3535
    3636    @Override
    37     public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored */}
     37    public void primitivesAdded(PrimitivesAddedEvent event) {
     38        // ignored
     39    }
    3840
    3941    @Override
    40     public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored */}
     42    public void primitivesRemoved(PrimitivesRemovedEvent event) {
     43        // ignored
     44    }
    4145
    4246    @Override
    43     public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignored */}
     47    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
     48        // ignored
     49    }
    4450
    4551    @Override
    46     public void nodeMoved(NodeMovedEvent event) {/* ignored */}
     52    public void nodeMoved(NodeMovedEvent event) {
     53        // ignored
     54    }
    4755
    4856    @Override
    49     public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
     57    public void relationMembersChanged(RelationMembersChangedEvent event) {
     58        // ignored
     59    }
    5060
    5161    @Override
    52     public void tagsChanged(TagsChangedEvent event) {/* ignored */}
     62    public void tagsChanged(TagsChangedEvent event) {
     63        // ignored
     64    }
    5365
    5466    @Override
    55     public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
     67    public void wayNodesChanged(WayNodesChangedEvent event) {
     68        // ignored
     69    }
    5670
    5771    /* ------------------------------------------------------------------------------ */
    … …  
    6175    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
    6276        // just init the model content. Don't register as DataSetListener. The mode
    63         // is already registered to receive DataChangedEvents from the current
    64         // edit layer
     77        // is already registered to receive DataChangedEvents from the current edit layer
    6578        if (newLayer != null) {
    6679            initFromDataSet(newLayer.data);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r8338 r8413  
    102102    @Override
    103103    public void dataChanged(DataChangedEvent event) {
    104         // just trigger a repaint - the display name of the relation members may
    105         // have changed
     104        // just trigger a repaint - the display name of the relation members may have changed
    106105        Collection<RelationMember> sel = getSelectedMembers();
    107106        fireTableDataChanged();
    … …  
    110109
    111110    @Override
    112     public void nodeMoved(NodeMovedEvent event) {/* ignore */}
    113     @Override
    114     public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
     111    public void nodeMoved(NodeMovedEvent event) {
     112        // ignore
     113    }
     114    @Override
     115    public void primitivesAdded(PrimitivesAddedEvent event) {
     116        // ignore
     117    }
    115118
    116119    @Override
    … …  
    142145
    143146    @Override
    144     public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */}
    145 
    146     @Override
    147     public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */}
     147    public void wayNodesChanged(WayNodesChangedEvent event) {
     148        // ignore
     149    }
     150
     151    @Override
     152    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
     153        // ignore
     154    }
     155
    148156    /* --------------------------------------------------------------------------- */
    149157
    … …  
    167175        members.clear();
    168176        if (relation != null) {
    169             // make sure we work with clones of the relation members
    170             // in the model.
     177            // make sure we work with clones of the relation members in the model.
    171178            members.addAll(new Relation(relation).getMembers());
    172179        }
    … …  
    711718    }
    712719
    713 
    714720    WayConnectionType getWayConnection(int i) {
    715721        if (connectionType == null) {

  • trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

    r8393 r8413  
    204204
    205205    /**
    206      * Called, when the layer is removed from the mapview and is going to be
    207      * destroyed.
     206     * Called, when the layer is removed from the mapview and is going to be destroyed.
    208207     *
    209208     * This is because the Layer constructor can not add itself safely as listener
    … …  
    212211     */
    213212    @Override
    214     public void destroy() {}
    215 
    216     public File getAssociatedFile() { return associatedFile; }
    217     public void setAssociatedFile(File file) { associatedFile = file; }
     213    public void destroy() {
     214        // Override in subclasses if needed
     215    }
     216
     217    public File getAssociatedFile() {
     218        return associatedFile;
     219    }
     220
     221    public void setAssociatedFile(File file) {
     222        associatedFile = file;
     223    }
    218224
    219225    /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

    r8390 r8413  
    433433                        @Override
    434434                        public void run() {
    435                             pnlPluginPreferences.refreshView();                        }
     435                            pnlPluginPreferences.refreshView();
     436                        }
    436437                    });
    437438                }

  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r8392 r8413  
    354354        public void filter() {
    355355            String expr = filterField.getText().trim();
    356             if (expr.isEmpty()) { expr=null; }
     356            if (expr.isEmpty()) {
     357                expr = null;
     358            }
    357359            try {
    358360                final TableRowSorter<? extends TableModel> sorter =
    … …  
    376378
    377379        @Override
    378         public void changedUpdate(DocumentEvent arg0) { filter(); }
    379         @Override
    380         public void insertUpdate(DocumentEvent arg0) {  filter(); }
    381         @Override
    382         public void removeUpdate(DocumentEvent arg0) { filter(); }
     380        public void changedUpdate(DocumentEvent e) {
     381            filter();
     382        }
     383        @Override
     384        public void insertUpdate(DocumentEvent e) {
     385            filter();
     386        }
     387        @Override
     388        public void removeUpdate(DocumentEvent e) {
     389            filter();
     390        }
    383391    }
    384392}

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

    r8394 r8413  
    933933
    934934        @Override
    935         boolean requestFocusInWindow() {return check.requestFocusInWindow();}
     935        boolean requestFocusInWindow() {
     936            return check.requestFocusInWindow();
     937        }
    936938
    937939        @Override

  • trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

    r8404 r8413  
    130130     * @see #setModel
    131131     */
    132     public Node getModel() { return model; }
     132    public Node getModel() {
     133        return model;
     134    }
    133135
    134136    /**
    … …  
    157159     * @see #setDividerSize
    158160     */
    159     public int getDividerSize() { return dividerSize; }
     161    public int getDividerSize() {
     162        return dividerSize;
     163    }
    160164
    161165    /**
    … …  
    180184     * @see #setFloatingDividers
    181185     */
    182     public boolean getFloatingDividers() { return floatingDividers; }
     186    public boolean getFloatingDividers() {
     187        return floatingDividers;
     188    }
    183189
    184190    /**
    … …  
    693699         * @return the invalid Node.
    694700         */
    695         public Node getNode() { return node; }
     701        public Node getNode() {
     702            return node;
     703        }
    696704    }
    697705
    … …  
    825833         * @see #parent_set
    826834         */
    827         public Split parent_get() { return parent; }
     835        public Split parent_get() {
     836            return parent;
     837        }
    828838
    829839        /**
    … …  
    873883         * @see #setWeight
    874884         */
    875         public double getWeight() { return weight; }
     885        public double getWeight() {
     886            return weight;
     887        }
    876888
    877889        /**
    … …  
    951963         * @see #setRowLayout
    952964         */
    953         public boolean isRowLayout() { return rowLayout; }
     965        public boolean isRowLayout() {
     966            return rowLayout;
     967        }
    954968
    955969        /**
    … …  
    10391053         * Create a Leaf node.  The default value of name is "".
    10401054         */
    1041         public Leaf() { }
     1055        public Leaf() {
     1056
     1057        }
    10421058
    10431059        /**
    … …  
    10591075         * @see #setName
    10601076         */
    1061         public String getName() { return name; }
     1077        public String getName() {
     1078            return name;
     1079        }
    10621080
    10631081        /**
Note: See TracChangeset for help on using the changeset viewer.