Changeset 32453 in osm for applications


Ignore:
Timestamp:
2016-06-30T00:01:38+02:00 (8 years ago)
Author:
donvip
Message:

remove calls to deprecated methods

Location:
applications/editors/josm/plugins/czechaddress
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/czechaddress/build.xml

    r32306 r32453  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="7001"/>
     7    <property name="plugin.main.version" value="10279"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java

    r31665 r32453  
    2222
    2323import org.openstreetmap.josm.Main;
     24import org.openstreetmap.josm.data.osm.DataSet;
    2425import org.openstreetmap.josm.data.osm.OsmPrimitive;
    2526import org.openstreetmap.josm.gui.IconToggleButton;
    … …  
    147148                reasoner.update(street);
    148149
    149             org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
     150            DataSet dataSet = Main.getLayerManager().getEditDataSet();
    150151            if (dataSet != null) {
    151152                for (OsmPrimitive prim : dataSet.allPrimitives()) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java

    r16750 r32453  
    2222     */
    2323    public static void zoomToMany(Collection<OsmPrimitive> primitives) {
    24         Main.main.getCurrentDataSet().setSelected(primitives);
     24        Main.getLayerManager().getEditDataSet().setSelected(primitives);
    2525        (new AutoScaleAction("selection")).actionPerformed(null);
    2626    }
    … …  
    3030     */
    3131    public static void zoomTo(OsmPrimitive primitive) {
    32         Main.main.getCurrentDataSet().setSelected(primitive);
     32        Main.getLayerManager().getEditDataSet().setSelected(primitive);
    3333        (new AutoScaleAction("selection")).actionPerformed(null);
    3434    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java

    r27852 r32453  
    107107        FactoryDialog.getInstance().selectionListenerActivated = false;
    108108        FactoryDialog.getInstance().selectNextUnmatchedHouseByCheckBox();
    109         Main.main.getCurrentDataSet().addPrimitive(newNode);
    110         Main.main.getCurrentDataSet().setSelected(newNode);
     109        Main.getLayerManager().getEditDataSet().addPrimitive(newNode);
     110        Main.getLayerManager().getEditDataSet().setSelected(newNode);
    111111        FactoryDialog.getInstance().selectionListenerActivated = true;
    112112    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java

    r29727 r32453  
    4343     */
    4444    public void actionPerformed(ActionEvent e) {
    45         org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
     45        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
    4646        if (dataSet == null) return;
    4747        Collection<OsmPrimitive> data = dataSet.getSelected();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java

    r30737 r32453  
    1414import org.openstreetmap.josm.Main;
    1515import org.openstreetmap.josm.actions.JosmAction;
     16import org.openstreetmap.josm.data.osm.DataSet;
    1617import org.openstreetmap.josm.data.osm.Node;
    1718import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    5354     */
    5455    public void actionPerformed(ActionEvent e) {
    55 
    56         Collection<Way> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
    57         Collection<Way> newSelection = new LinkedList<>(Main.main.getCurrentDataSet().getSelectedWays());
     56        DataSet ds = Main.getLayerManager().getEditDataSet();
     57        Collection<Way> selectedWays = ds.getSelectedWays();
     58        Collection<Way> newSelection = new LinkedList<>(ds.getSelectedWays());
    5859
    5960        for (Way area : selectedWays) {
    6061            if (! area.isClosed()) continue;
    6162
    62             for (OsmPrimitive prim2 : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
     63            for (OsmPrimitive prim2 : ds.allNonDeletedPrimitives()) {
    6364                if (!(prim2 instanceof Way)) continue;
    6465                if (prim2.equals(area))      continue;
    … …  
    8283
    8384                if (errorCode == 0) {
    84                     Main.main.getCurrentDataSet().addPrimitive(newArea1);
    85                     Main.main.getCurrentDataSet().addPrimitive(newArea2);
     85                    ds.addPrimitive(newArea1);
     86                    ds.addPrimitive(newArea2);
    8687
    8788                    area.setDeleted(true);
    … …  
    9899        }
    99100
    100         Main.main.getCurrentDataSet().setSelected(newSelection);
     101        ds.setSelected(newSelection);
    101102    }
    102103
    … …  
    113114    private int splitArea(Way area, Way border, Way newArea1, Way newArea2) {
    114115
    115         for (Relation r : Main.main.getCurrentDataSet().getRelations())
     116        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations())
    116117            for (RelationMember rm : r.getMembers())
    117118                if (rm.refersTo(area) || rm.refersTo(border))

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java

    r30737 r32453  
    8787
    8888        BoundingXYVisitor visitor = new BoundingXYVisitor();
    89         org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
     89        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
    9090        if (dataSet == null) return;
    9191
    … …  
    110110            System.out.println("AUTO: Center is " + center);
    111111
    112         for (OsmPrimitive op : Main.main.getCurrentDataSet().allPrimitives()) {
     112        for (OsmPrimitive op : Main.getLayerManager().getEditDataSet().allPrimitives()) {
    113113
    114114            if (!(op instanceof Node)) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java

    r30737 r32453  
    4747        dbEditButton.setIcon(ImageProvider.get("actions", "edit.png"));
    4848
    49         org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
     49        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
    5050        if (dataSet != null) {
    5151            Capitalizator cap = new Capitalizator(dataSet.allPrimitives(),

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java

    r30737 r32453  
    104104            proposalContainer.applyAll();
    105105
    106             Main.main.getCurrentDataSet().setSelected((Node) null); // TODO: This is an ugly hack.
    107             Main.main.getCurrentDataSet().setSelected(proposalContainer.getTarget());
     106            Main.getLayerManager().getEditDataSet().setSelected((Node) null); // TODO: This is an ugly hack.
     107            Main.getLayerManager().getEditDataSet().setSelected(proposalContainer.getTarget());
    108108
    109109            AddressElement elem = (AddressElement) matchesComboBox.getSelectedItem();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java

    r23190 r32453  
    1313
    1414    @Override
    15     public Component getListCellRendererComponent(JList list, Object value,
     15    public Component getListCellRendererComponent(JList<?> list, Object value,
    1616                          int index, boolean isSelected, boolean cellHasFocus) {
    1717

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java

    r29661 r32453  
    6666           way.remove(key);
    6767
    68         Main.main.getCurrentDataSet().addPrimitive(addrNode);
     68        Main.getLayerManager().getEditDataSet().addPrimitive(addrNode);
    6969    }
    7070
    … …  
    7878        return "Vytvořit z budovy samostatný adresní uzel.";
    7979    }
    80 
    81 
    82 
    8380}
Note: See TracChangeset for help on using the changeset viewer.