Changeset 31114 in osm for applications/editors/josm


Ignore:
Timestamp:
2015-05-03T18:52:19+02:00 (10 years ago)
Author:
donvip
Message:

[josm_plugins] update to JOSM 7817

Location:
applications/editors/josm/plugins
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r30416 r31114  
    55        <property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
    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="7817" />
    88
    99    <property name="plugin.author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>

  • applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

    r29531 r31114  
    305305        BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
    306306        visitBoundingBox(boundingXYVisitor);
    307         Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
     307        Main.map.mapView.zoomTo(boundingXYVisitor);
    308308    }
    309309

  • applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java

    r29805 r31114  
    6060            BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
    6161            layer.visitBoundingBox(boundingXYVisitor);
    62             Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
     62            Main.map.mapView.zoomTo(boundingXYVisitor);
    6363        }
    6464    }

  • applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java

    r29803 r31114  
    6060            BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
    6161            layer.visitBoundingBox(boundingXYVisitor);
    62             Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
     62            Main.map.mapView.zoomTo(boundingXYVisitor);
    6363        }
    6464    }

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

    r30962 r31114  
    33    <property name="commit.message" value="[josm/PicLayer] - #10335 add interpolation hints for the image drawing"/>
    44    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    5     <property name="plugin.main.version" value="7001"/>
     5    <property name="plugin.main.version" value="7817"/>
    66       
    77    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java

    r30737 r31114  
    172172            BoundingXYVisitor v = new BoundingXYVisitor();
    173173            layer.visitBoundingBox(v);
    174             Main.map.mapView.recalculateCenterScale(v);
     174            Main.map.mapView.zoomTo(v);
    175175        }
    176176    }

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

    r30664 r31114  
    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="7575"/>
     7    <property name="plugin.main.version" value="7817"/>
    88
    99    <property name="plugin.author" value="Roland M. Olbricht"/>

  • applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java

    r30701 r31114  
    6767  }
    6868
    69   public void actionPerformed(ActionEvent event) {
     69  @Override
     70public void actionPerformed(ActionEvent event) {
    7071
    7172    if (dialog == null)
    … …  
    316317      return;
    317318    box.enlargeBoundingBox();
    318     Main.map.mapView.recalculateCenterScale(box);
     319    Main.map.mapView.zoomTo(box);
    319320  }
    320321
    … …  
    357358  private class FocusAddAction extends AbstractAction
    358359  {
     360    @Override
    359361    public void actionPerformed(ActionEvent e)
    360362    {

  • applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

    r30532 r31114  
    6464    }
    6565
     66    @Override
    6667    public void valueChanged(ListSelectionEvent e) {
    6768      root.routesSelectionChanged();
    … …  
    7677    }
    7778
     79    @Override
    7880    public int compareTo(RouteReference rr) {
    7981      if (route.get("route") != null)
    … …  
    124126    }
    125127
     128    @Override
    126129    public String toString() {
    127130      String buf = route.get("route");
    … …  
    162165    }
    163166
     167    @Override
    164168    public boolean isCellEditable(int row, int column) {
    165169      if ((column == 0) && (hasFixedKeys))
    … …  
    207211    }
    208212
     213    @Override
    209214    public void tableChanged(TableModelEvent e)
    210215    {
    … …  
    242247    }
    243248
     249    @Override
    244250    public TableCellEditor getCellEditor(int row, int column) {
    245251      TableCellEditor editor = null;
    … …  
    266272    public Vector<Node> nodes = new Vector<Node>();
    267273
     274    @Override
    268275    public boolean isCellEditable(int row, int column) {
    269276      if (column != STOPLIST_ROLE_COLUMN)
    … …  
    272279    }
    273280
     281    @Override
    274282    public void addRow(Object[] obj) {
    275283      throw new UnsupportedOperationException();
    276284    }
    277285
     286    @Override
    278287    public void insertRow(int insPos, Object[] obj) {
    279288      throw new UnsupportedOperationException();
    … …  
    323332
    324333  private class StoplistTableModelListener implements TableModelListener {
     334    @Override
    325335    public void tableChanged(TableModelEvent e)
    326336    {
    … …  
    383393    }
    384394
     395    @Override
    385396    public int compareTo(StopReference sr) {
    386397      if (this.index < sr.index)
    … …  
    426437  }
    427438
    428   public void actionPerformed(ActionEvent event) {
     439  @Override
     440public void actionPerformed(ActionEvent event) {
    429441    Frame frame = JOptionPane.getFrameForComponent(Main.parent);
    430442    DataSet mainDataSet = Main.main.getCurrentDataSet();
    … …  
    10781090      for (int i = 0; i < relsListModel.size(); ++i)
    10791091      {
    1080     if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
     1092    if (currentRoute == relsListModel.elementAt(i).route)
    10811093      relsList.setSelectedIndex(i);
    10821094      }
    … …  
    10931105      for (int i = 0; i < relsListModel.size(); ++i)
    10941106      {
    1095     if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
     1107    if (currentRoute == relsListModel.elementAt(i).route)
    10961108      relsList.setSelectedIndex(i);
    10971109      }
    … …  
    11511163      for (int i = 0; i < relsListModel.size(); ++i)
    11521164      {
    1153         if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
     1165        if (currentRoute == relsListModel.elementAt(i).route)
    11541166          relsList.setSelectedIndex(i);
    11551167      }
    … …  
    12311243        return;
    12321244      box.enlargeBoundingBox();
    1233       Main.map.mapView.recalculateCenterScale(box);
     1245      Main.map.mapView.zoomTo(box);
    12341246    }
    12351247    else if ("routePattern.itineraryMark".equals(event.getActionCommand()))
    … …  
    15141526        return;
    15151527      box.enlargeBoundingBox();
    1516       Main.map.mapView.recalculateCenterScale(box);
     1528      Main.map.mapView.zoomTo(box);
    15171529    }
    15181530    else if ("routePattern.stoplistMark".equals(event.getActionCommand()))
    … …  
    20642076    if (relsList.isSelectedIndex(selectedPos))
    20652077    {
    2066       currentRoute = ((RouteReference)relsListModel.elementAt(selectedPos)).route;
     2078      currentRoute = relsListModel.elementAt(selectedPos).route;
    20672079      tabbedPane.setEnabledAt(1, true);
    20682080      tabbedPane.setEnabledAt(2, true);
    … …  
    21632175        if (!(way.isIncomplete()))
    21642176        {
    2165           if ("backward".equals((String)(itineraryData.getValueAt(i, 1))))
     2177          if ("backward".equals((itineraryData.getValueAt(i, 1))))
    21662178          {
    21672179            for (int j = way.getNodesCount()-2; j >= 0; --j)

  • applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

    r30532 r31114  
    7474  }
    7575
    76   public void actionPerformed(ActionEvent event)
     76  @Override
     77public void actionPerformed(ActionEvent event)
    7778  {
    7879    if (dialog == null)
    … …  
    246247    if (selectedPos >= 0)
    247248    {
    248       currentTrack = ((TrackReference)tracksListModel.elementAt(selectedPos));
     249      currentTrack = (tracksListModel.elementAt(selectedPos));
    249250      dialog.setTrackValid(true);
    250251
    … …  
    256257      //Prepare Stoplist
    257258      dialog.setStoplistTableModel
    258           (((TrackReference)tracksListModel.elementAt(selectedPos)).stoplistTM);
     259          (tracksListModel.elementAt(selectedPos).stoplistTM);
    259260    }
    260261    else
    … …  
    354355      return;
    355356    box.enlargeBoundingBox();
    356     Main.map.mapView.recalculateCenterScale(box);
     357    Main.map.mapView.zoomTo(box);
    357358  }
    358359
    … …  
    402403    return new AbstractAction()
    403404    {
    404       public void actionPerformed(ActionEvent e)
     405      @Override
     406    public void actionPerformed(ActionEvent e)
    405407      {
    406408        JTable table = dialog.getWaypointsTable();
    … …  
    430432    return new AbstractAction()
    431433    {
    432       public void actionPerformed(ActionEvent e)
     434      @Override
     435    public void actionPerformed(ActionEvent e)
    433436      {
    434437        JTable table = dialog.getStoplistTable();
    … …  
    446449  private class FocusWaypointNameAction extends AbstractAction
    447450  {
     451    @Override
    448452    public void actionPerformed(ActionEvent e)
    449453    {
    … …  
    476480    }
    477481
     482    @Override
    478483    public void actionPerformed(ActionEvent e)
    479484    {
    … …  
    499504  private class FocusTrackStoplistNameAction extends AbstractAction
    500505  {
     506    @Override
    501507    public void actionPerformed(ActionEvent e)
    502508    {
    … …  
    529535    }
    530536
     537    @Override
    531538    public void actionPerformed(ActionEvent e)
    532539    {

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

    r30416 r31114  
    55    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    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="7817"/>
    88
    99    <property name="plugin.author" value="Frederik Ram"/>

  • applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java

    r30737 r31114  
    7979                BoundingXYVisitor bbox = new BoundingXYVisitor();
    8080                bbox.visit(printBounds);
    81                 Main.map.mapView.recalculateCenterScale(bbox);
     81                Main.map.mapView.zoomTo(bbox);
    8282                needRedraw = true;
    8383            }

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

    r31035 r31114  
    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="7521"/>
     7    <property name="plugin.main.version" value="7817"/>
    88    <property name="plugin.canloadatruntime" value="true"/>
    99

  • applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java

    r30737 r31114  
    7474                            BoundingXYVisitor bbox = new BoundingXYVisitor();
    7575                            bbox.visit(entry.coordinate);
    76                             Main.map.mapView.recalculateCenterScale(bbox);
     76                            Main.map.mapView.zoomTo(bbox);
    7777                        }
    7878                        SearchAction.search(entry.name.replaceAll("\\(.*\\)", ""), SearchAction.SearchMode.replace);
Note: See TracChangeset for help on using the changeset viewer.