Ignore:
Timestamp:
2014-08-14T11:27:38+02:00 (5 years ago)
Author:
Don-vip
Message:

code cleanup, javadoc update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r7012 r7392  
    2727import org.openstreetmap.josm.command.Command;
    2828import org.openstreetmap.josm.command.SequenceCommand;
    29 import org.openstreetmap.josm.data.osm.MultipolygonCreate;
    30 import org.openstreetmap.josm.data.osm.MultipolygonCreate.JoinedPolygon;
     29import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
     30import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
    3131import org.openstreetmap.josm.data.osm.OsmPrimitive;
    3232import org.openstreetmap.josm.data.osm.Relation;
     
    191191        ways.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
    192192
    193         final MultipolygonCreate polygon = analyzeWays(ways, true);
     193        final MultipolygonBuilder polygon = analyzeWays(ways, true);
    194194        if (polygon == null) {
    195195            return null; //could not make multipolygon.
     
    204204    public static Pair<Relation, Relation> createMultipolygonRelation(Collection<Way> selectedWays, boolean showNotif) {
    205205
    206         final MultipolygonCreate polygon = analyzeWays(selectedWays, showNotif);
     206        final MultipolygonBuilder polygon = analyzeWays(selectedWays, showNotif);
    207207        if (polygon == null) {
    208208            return null; //could not make multipolygon.
     
    265265     * @return <code>null</code>, if there was a problem with the ways.
    266266     */
    267     private static MultipolygonCreate analyzeWays(Collection < Way > selectedWays, boolean showNotif) {
    268 
    269         MultipolygonCreate pol = new MultipolygonCreate();
     267    private static MultipolygonBuilder analyzeWays(Collection < Way > selectedWays, boolean showNotif) {
     268
     269        MultipolygonBuilder pol = new MultipolygonBuilder();
    270270        String error = pol.makeFromWays(selectedWays);
    271271
     
    287287     * @return multipolygon relation
    288288     */
    289     private static Relation createRelation(MultipolygonCreate pol, final Relation rel) {
     289    private static Relation createRelation(MultipolygonBuilder pol, final Relation rel) {
    290290        // Create new relation
    291291        rel.put("type", "multipolygon");
Note: See TracChangeset for help on using the changeset viewer.