Changeset 31451 in osm


Ignore:
Timestamp:
2015-08-05T11:45:56+02:00 (9 years ago)
Author:
nokutu
Message:

Forced method access instead of parameter to get MapillaryData from MapillaryLayer.

Location:
applications/editors/josm/plugins/mapillary
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

    r31450 r31451  
    8282
    8383  /** {@link MapillaryData} object that stores the database */
    84   public final MapillaryData data;
     84  private final MapillaryData data;
    8585
    8686  /** The bounds of the areas for which the pictures have been downloaded */
    … …  
    172172   * @return The {@link MapillaryData} object that stores the database.
    173173   */
    174   public MapillaryData getMapillaryData() {
     174  public MapillaryData getData() {
    175175    return this.data;
    176176  }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java

    r31401 r31451  
    9797    g.setColor(Color.MAGENTA);
    9898    for (MapillaryAbstractImage img : MapillaryLayer.getInstance()
    99         .getMapillaryData().getImages()) {
     99        .getData().getImages()) {
    100100      if (img instanceof MapillaryImage) {
    101101        g.fillOval(mv.getPoint(img.getLatLon()).x - 3,

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

    r31450 r31451  
    7171        && this.dialog.chooser != null) {
    7272      if (this.dialog.group.isSelected(this.dialog.all.getModel())) {
    73         export(MapillaryLayer.getInstance().data.getImages());
     73        export(MapillaryLayer.getInstance().getData().getImages());
    7474      } else if (this.dialog.group.isSelected(this.dialog.sequence.getModel())) {
    7575        ArrayList<MapillaryAbstractImage> images = new ArrayList<>();
    76         for (MapillaryAbstractImage image : MapillaryLayer.getInstance().data
    77             .getMultiSelectedImages())
     76        for (MapillaryAbstractImage image : MapillaryLayer.getInstance()
     77            .getData().getMultiSelectedImages())
    7878          if (image instanceof MapillaryImage) {
    7979            if (!images.contains(image))
    … …  
    8383        export(images);
    8484      } else if (this.dialog.group.isSelected(this.dialog.selected.getModel())) {
    85         export(MapillaryLayer.getInstance().data.getMultiSelectedImages());
     85        export(MapillaryLayer.getInstance().getData().getMultiSelectedImages());
    8686      }
    8787      // This option ignores the selected directory.
    8888    } else if (this.dialog.group.isSelected(this.dialog.rewrite.getModel())) {
    8989      ArrayList<MapillaryImportedImage> images = new ArrayList<>();
    90       for (MapillaryAbstractImage image : MapillaryLayer.getInstance().data
    91           .getImages())
     90      for (MapillaryAbstractImage image : MapillaryLayer.getInstance()
     91          .getData().getImages())
    9292        if (image instanceof MapillaryImportedImage) {
    9393          images.add(((MapillaryImportedImage) image));

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

    r31450 r31451  
    8484            try {
    8585              if (extension.equals("jpg") || extension.equals("jpeg"))
    86                 MapillaryLayer.getInstance().data.add(readJPG(file.listFiles()[j]));
     86                MapillaryLayer.getInstance().getData()
     87                    .add(readJPG(file.listFiles()[j]));
    8788
    8889              else if (extension.equals("png"))
    89                 MapillaryLayer.getInstance().data.add(readPNG(file.listFiles()[j]));
     90                MapillaryLayer.getInstance().getData()
     91                    .add(readPNG(file.listFiles()[j]));
    9092            } catch (ImageReadException | IOException | NullPointerException e1) {
    9193              Main.error(e1);
    … …  
    98100                  .equals(".jpeg")) {
    99101            try {
    100               MapillaryLayer.getInstance().data.add(readJPG(file));
     102              MapillaryLayer.getInstance().getData().add(readJPG(file));
    101103            } catch (ImageReadException ex) {
    102104              Main.error(ex);
    … …  
    106108          } else if (file.getPath().substring(file.getPath().length() - 4)
    107109              .equals(".png")) {
    108             MapillaryLayer.getInstance().data.add(readPNG(file));
     110            MapillaryLayer.getInstance().getData().add(readPNG(file));
    109111          }
    110112        }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java

    r31450 r31451  
    161161      MapillaryImportedImage image = new MapillaryImportedImage(latValue,
    162162          lonValue, caValue, file, datetimeOriginal.getStringValue());
    163       MapillaryLayer.getInstance().data.add(image);
     163      MapillaryLayer.getInstance().getData().add(image);
    164164      image.getCapturedAt();
    165165

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java

    r31450 r31451  
    3838            Shortcut.NONE), false, "mapillaryUpload", false);
    3939    this.setEnabled(false);
    40     MapillaryLayer.getInstance().data.addListener(this);
     40    MapillaryLayer.getInstance().getData().addListener(this);
    4141  }
    4242
    … …  
    5353        && (int) pane.getValue() == JOptionPane.OK_OPTION) {
    5454      if (dialog.sequence.isSelected()) {
    55         OAuthUtils.uploadSequence(MapillaryLayer.getInstance().data
     55        OAuthUtils.uploadSequence(MapillaryLayer.getInstance().getData()
    5656            .getSelectedImage().getSequence());
    5757      }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java

    r31450 r31451  
    3535            KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryZoom",
    3636        false);
    37     MapillaryLayer.getInstance().data.addListener(this);
     37    MapillaryLayer.getInstance().getData().addListener(this);
    3838    this.setEnabled(false);
    3939  }
    … …  
    4141  @Override
    4242  public void actionPerformed(ActionEvent arg0) {
    43     if (MapillaryLayer.getInstance().data.getSelectedImage() == null)
     43    if (MapillaryLayer.getInstance().getData().getSelectedImage() == null)
    4444      throw new IllegalStateException();
    45     Main.map.mapView.zoomTo(MapillaryLayer.getInstance().data
     45    Main.map.mapView.zoomTo(MapillaryLayer.getInstance().getData()
    4646        .getSelectedImage().getLatLon());
    4747  }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java

    r31445 r31451  
    5151    this.followSelected = followSelected;
    5252    this.goForward = goForward;
    53     this.data = MapillaryLayer.getInstance().getMapillaryData();
     53    this.data = MapillaryLayer.getInstance().getData();
    5454    this.data.addListener(this);
    5555  }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java

    r31445 r31451  
    6464    queryStringParts.put("max_lat", maxLatLon.lat());
    6565    queryStringParts.put("max_lon", maxLatLon.lon());
    66     run(new MapillarySquareDownloadManagerThread(queryStringParts,
    67         MapillaryLayer.getInstance()));
     66    run(new MapillarySquareDownloadManagerThread(queryStringParts));
    6867  }
    6968

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java

    r31445 r31451  
    2727  private final String queryString;
    2828  private final ExecutorService ex;
    29   private final MapillaryLayer layer;
    3029
    3130  /**
    … …  
    3635   * @param queryString
    3736   *          A String containing the parameters for the download.
    38    * @param layer
    39    *          The layer to store the data.
    4037   */
    4138  public MapillaryImageInfoDownloaderThread(ExecutorService ex,
    42       String queryString, MapillaryLayer layer) {
     39      String queryString) {
    4340    this.ex = ex;
    4441    this.queryString = queryString;
    45     this.layer = layer;
    4642  }
    4743
    … …  
    5955        data = jsonarr.getJsonObject(i);
    6056        String key = data.getString("key");
    61         for (MapillaryAbstractImage image : this.layer.getMapillaryData()
     57        for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData()
    6258            .getImages()) {
    6359          if (image instanceof MapillaryImage) {

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java

    r31445 r31451  
    101101        try {
    102102          for (MapillaryImage img : finalImages) {
    103             if (this.layer.getMapillaryData().getImages().contains(img)) {
     103            if (this.layer.getData().getImages().contains(img)) {
    104104              // The image in finalImages is substituted by the one in the
    105105              // database, as they represent the same picture.
    106               img = (MapillaryImage) this.layer.getMapillaryData().getImages()
    107                   .get(this.layer.getMapillaryData().getImages().indexOf(img));
     106              img = (MapillaryImage) this.layer.getData().getImages()
     107                  .get(this.layer.getData().getImages().indexOf(img));
    108108              sequence.add(img);
    109               ((MapillaryImage) this.layer.getMapillaryData().getImages()
    110                   .get(this.layer.getMapillaryData().getImages().indexOf(img)))
     109              ((MapillaryImage) this.layer.getData().getImages()
     110                  .get(this.layer.getData().getImages().indexOf(img)))
    111111                  .setSequence(sequence);
    112112              finalImages.set(finalImages.indexOf(img), img);
    … …  
    121121        }
    122122
    123         this.layer.getMapillaryData().add(
     123        this.layer.getData().add(
    124124            new ArrayList<MapillaryAbstractImage>(finalImages), false);
    125125      }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java

    r31449 r31451  
    3030  private final String sequenceQueryString;
    3131  private final String signQueryString;
    32   private final MapillaryLayer layer;
    3332
    3433  /**
    … …  
    3736   * @param queryStringParts
    3837   *          The query data.
    39    * @param layer
    40    *          The layer to store the images.
    4138   *
    4239   */
    4340  public MapillarySquareDownloadManagerThread(
    44       ConcurrentHashMap<String, Double> queryStringParts, MapillaryLayer layer) {
     41      ConcurrentHashMap<String, Double> queryStringParts) {
    4542    this.imageQueryString = buildQueryString(queryStringParts);
    4643    this.sequenceQueryString = buildQueryString(queryStringParts);
    … …  
    4946    // TODO: Move this line to the appropriate place, here's no GET-request
    5047    Main.info("GET " + this.sequenceQueryString + " (Mapillary plugin)");
    51 
    52     this.layer = layer;
    5348  }
    5449
    … …  
    8580      MapillaryLayer.getInstance().updateHelpText();
    8681    }
    87     this.layer.updateHelpText();
     82    MapillaryLayer.getInstance().updateHelpText();
    8883    MapillaryData.dataUpdated();
    8984    MapillaryFilterDialog.getInstance().refresh();
    … …  
    112107    while (!ex.isShutdown()) {
    113108      ex.execute(new MapillaryImageInfoDownloaderThread(ex,
    114           this.imageQueryString + "&page=" + page + "&limit=20", this.layer));
     109          this.imageQueryString + "&page=" + page + "&limit=20"));
    115110      while (ex.getQueue().remainingCapacity() == 0)
    116111        Thread.sleep(100);
    … …  
    126121    while (!ex.isShutdown()) {
    127122      ex.execute(new MapillaryTrafficSignDownloaderThread(ex,
    128           this.signQueryString + "&page=" + page + "&limit=20", this.layer));
     123          this.signQueryString + "&page=" + page + "&limit=20"));
    129124      while (ex.getQueue().remainingCapacity() == 0)
    130125        Thread.sleep(100);

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryTrafficSignDownloaderThread.java

    r31445 r31451  
    2828  private final String queryString;
    2929  private final ExecutorService ex;
    30   private final MapillaryLayer layer;
    3130
    3231  /**
    … …  
    3736   * @param queryString
    3837   *          A String containing the parameter for the download.
    39    * @param layer
    40    *          The layer to store the data.
    4138   */
    4239  public MapillaryTrafficSignDownloaderThread(ExecutorService ex,
    43       String queryString, MapillaryLayer layer) {
     40      String queryString) {
    4441    this.ex = ex;
    4542    this.queryString = queryString;
    46     this.layer = layer;
    4743  }
    4844
    … …  
    5147    BufferedReader br;
    5248    try {
    53       br = new BufferedReader(new InputStreamReader(
    54           new URL(URL + this.queryString).openStream(), "UTF-8"));
     49      br = new BufferedReader(new InputStreamReader(new URL(URL
     50          + this.queryString).openStream(), "UTF-8"));
    5551      JsonObject jsonobj = Json.createReader(br).readObject();
    5652      if (!jsonobj.getBoolean("more")) {
    … …  
    6864            for (int k = 0; k < rects.size(); k++) {
    6965              JsonObject data = rects.getJsonObject(k);
    70               for (MapillaryAbstractImage image : this.layer.getMapillaryData()
    71                   .getImages())
     66              for (MapillaryAbstractImage image : MapillaryLayer.getInstance()
     67                  .getData().getImages())
    7268                if (image instanceof MapillaryImage
    7369                    && ((MapillaryImage) image).getKey().equals(key))
    … …  
    8177          for (int j = 0; j < rects.size(); j++) {
    8278            JsonObject data = rects.getJsonObject(j);
    83             for (MapillaryAbstractImage image : this.layer.getMapillaryData()
    84                 .getImages())
     79            for (MapillaryAbstractImage image : MapillaryLayer.getInstance()
     80                .getData().getImages())
    8581              if (image instanceof MapillaryImage
    8682                  && ((MapillaryImage) image).getKey().equals(key))

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java

    r31450 r31451  
    8181    this.group.add(this.rewrite);
    8282    // Some options are disabled depending on the circumstances
    83     if (MapillaryLayer.getInstance().data.getSelectedImage() == null
    84         || !(MapillaryLayer.getInstance().data.getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryLayer
    85             .getInstance().data.getSelectedImage()).getSequence() != null)) {
     83    if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
     84        || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryLayer
     85            .getInstance().getData().getSelectedImage()).getSequence() != null)) {
    8686      this.sequence.setEnabled(false);
    8787    }
    88     if (MapillaryLayer.getInstance().data.getMultiSelectedImages().isEmpty()) {
     88    if (MapillaryLayer.getInstance().getData().getMultiSelectedImages()
     89        .isEmpty()) {
    8990      this.selected.setEnabled(false);
    9091    }
    9192    this.rewrite.setEnabled(false);
    92     for (MapillaryAbstractImage img : MapillaryLayer.getInstance().data
     93    for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData()
    9394        .getImages())
    9495      if (img instanceof MapillaryImportedImage)

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java

    r31450 r31451  
    176176    boolean onlySigns = this.onlySigns.isSelected();
    177177
    178     for (MapillaryAbstractImage img : MapillaryLayer.getInstance().data
     178    for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData()
    179179        .getImages()) {
    180180      img.setVisible(true);

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java

    r31450 r31451  
    9696            tr("Open Mapillary main dialog"), KeyEvent.VK_M, Shortcut.NONE),
    9797        200, false, MapillaryPreferenceSetting.class);
    98     MapillaryLayer.getInstance().data.addListener(this);
     98    MapillaryLayer.getInstance().getData().addListener(this);
    9999    addShortcuts();
    100100    this.mapillaryImageDisplay = new MapillaryImageDisplay();
    … …  
    344344    @Override
    345345    public void actionPerformed(ActionEvent e) {
    346       MapillaryLayer.getInstance().data.selectNext();
     346      MapillaryLayer.getInstance().getData().selectNext();
    347347    }
    348348  }
    … …  
    366366    @Override
    367367    public void actionPerformed(ActionEvent e) {
    368       MapillaryLayer.getInstance().data.selectPrevious();
     368      MapillaryLayer.getInstance().getData().selectPrevious();
    369369    }
    370370  }
    … …  
    389389    public void actionPerformed(ActionEvent e) {
    390390      if (MapillaryMainDialog.getInstance().getImage() != null) {
    391         MapillaryLayer.getInstance().data.setSelectedImage(MapillaryLayer.RED,
    392             true);
     391        MapillaryLayer.getInstance().getData()
     392            .setSelectedImage(MapillaryLayer.RED, true);
    393393      }
    394394    }
    … …  
    414414    public void actionPerformed(ActionEvent e) {
    415415      if (MapillaryMainDialog.getInstance().getImage() != null) {
    416         MapillaryLayer.getInstance().data.setSelectedImage(MapillaryLayer.BLUE,
    417             true);
     416        MapillaryLayer.getInstance().getData()
     417            .setSelectedImage(MapillaryLayer.BLUE, true);
    418418      }
    419419    }

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java

    r31450 r31451  
    2828
    2929    this.sequence = new JRadioButton("Upload selected sequence.");
    30     if (MapillaryLayer.getInstance().data.getSelectedImage() == null
    31         || !(MapillaryLayer.getInstance().data.getSelectedImage() instanceof MapillaryImportedImage))
     30    if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
     31        || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage))
    3232      this.sequence.setEnabled(false);
    3333    this.group.add(this.sequence);

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java

    r31450 r31451  
    2828  private final static int DOWNLOAD_COOLDOWN = 2000;
    2929
    30   protected MapillaryData data = MapillaryLayer.getInstance().data;
     30  protected MapillaryData data = MapillaryLayer.getInstance().getData();
    3131  private static SemiautomaticThread semiautomaticThread = new SemiautomaticThread();
    3232
    … …  
    5555  /**
    5656   * Paint the dataset using the engine set.
     57   *
    5758   * @param g
    58    * @param mv The object that can translate GeoPoints to screen coordinates.
     59   * @param mv
     60   *          The object that can translate GeoPoints to screen coordinates.
    5961   * @param box
    6062   */

  • applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java

    r31445 r31451  
    5959
    6060        int page = 1;
    61         while (!ex.isShutdown() && MapillaryLayer.getInstance().getMapillaryData().getImages().size() <= 0 && page < 50) {
     61        while (!ex.isShutdown() && MapillaryLayer.getInstance().getData().getImages().size() <= 0 && page < 50) {
    6262            System.out.println("Sending sequence-request "+page+" to Mapillary-servers…");
    6363            Thread downloadThread = new MapillarySequenceDownloadThread(ex, queryString+"&page="+page);
    … …  
    6767            Thread.sleep(500);
    6868        }
    69         assertTrue(MapillaryLayer.getInstance().getMapillaryData().getImages().size() >= 1);
     69        assertTrue(MapillaryLayer.getInstance().getData().getImages().size() >= 1);
    7070        System.out.println("One or more images were added to the MapillaryLayer within the given bounds.");
    7171    }
Note: See TracChangeset for help on using the changeset viewer.