Ignore:
Timestamp:
2016-06-24T09:10:57+02:00 (10 years ago)
Author:
donvip
Message:

checkstyle, update to JOSM 10279

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java

    r30737 r32395  
     1// License: GPL. For details, see LICENSE file.
    12package relcontext.actions;
    23
    34import static org.openstreetmap.josm.tools.I18n.tr;
     5
    46import java.awt.event.ActionEvent;
    57import java.util.Collections;
    68import java.util.HashSet;
    79import java.util.Set;
     10
    811import javax.swing.AbstractAction;
     12
    913import org.openstreetmap.josm.Main;
    1014import org.openstreetmap.josm.data.osm.OsmPrimitive;
     
    1418import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
    1519import org.openstreetmap.josm.tools.ImageProvider;
     20
    1621import relcontext.ChosenRelation;
    1722import relcontext.ChosenRelationListener;
     
    1924/**
    2025 * Downloads or updates chosen relation members, depending on completeness.
    21  * 
     26 *
    2227 * @author Zverik
    2328 */
     
    2530    private ChosenRelation rel;
    2631
    27     public DownloadChosenRelationAction( ChosenRelation rel ) {
     32    public DownloadChosenRelationAction(ChosenRelation rel) {
    2833        super();
    29 //        putValue(NAME, "D");
     34        //        putValue(NAME, "D");
    3035        putValue(SMALL_ICON, ImageProvider.get("relcontext", "download"));
    3136        putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation"));
     
    3540    }
    3641
    37     public void actionPerformed( ActionEvent e ) {
     42    @Override
     43    public void actionPerformed(ActionEvent e) {
    3844        Relation relation = rel.get();
    39         if( relation == null || relation.isNew() ) return;
     45        if (relation == null || relation.isNew() ) return;
    4046        int total = relation.getMembersCount();
    4147        int incomplete = relation.getIncompleteMembers().size();
    42 //        if( incomplete <= 5 || (incomplete <= 10 && incomplete * 3 < total) )
    43         if( incomplete <= 10 && incomplete * 3 < total )
     48        //        if (incomplete <= 5 || (incomplete <= 10 && incomplete * 3 < total) )
     49        if (incomplete <= 10 && incomplete * 3 < total ) {
    4450            downloadIncomplete(relation);
    45         else
     51        } else {
    4652            downloadMembers(relation);
     53        }
    4754    }
    4855
    49     public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
     56    @Override
     57    public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
    5058        boolean incomplete = false;
    51         if( newRelation != null ) {
    52             for( RelationMember m : newRelation.getMembers()) {
    53                 if( m.getMember().isIncomplete() ) {
     59        if (newRelation != null) {
     60            for (RelationMember m : newRelation.getMembers()) {
     61                if (m.getMember().isIncomplete()) {
    5462                    incomplete = true;
    5563                    break;
     
    6068    }
    6169
    62     protected void downloadMembers( Relation rel ) {
    63         if( !rel.isNew() ) {
     70    protected void downloadMembers(Relation rel) {
     71        if (!rel.isNew()) {
    6472            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.main.getEditLayer()));
    6573        }
    6674    }
    6775
    68     protected void downloadIncomplete( Relation rel ) {
    69         if( rel.isNew() ) return;
     76    protected void downloadIncomplete(Relation rel) {
     77        if (rel.isNew() ) return;
    7078        Set<OsmPrimitive> ret = new HashSet<>();
    7179        ret.addAll(rel.getIncompleteMembers());
    72         if( ret.isEmpty() ) return;
     80        if (ret.isEmpty() ) return;
    7381        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.main.getEditLayer()));
    7482    }
Note: See TracChangeset for help on using the changeset viewer.