Changeset 31909 in osm


Ignore:
Timestamp:
2016-01-02T14:22:20+01:00 (9 years ago)
Author:
donvip
Message:

[josm_mapillary] fix warnings

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

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs

    r31465 r31909  
    11eclipse.preferences.version=1
     2org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
     3org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
     4org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
     5org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
     6org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
     7org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
    28org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    39org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
    410org.eclipse.jdt.core.compiler.compliance=1.7
     11org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    512org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
     13org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
     14org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
     15org.eclipse.jdt.core.compiler.problem.deadCode=warning
     16org.eclipse.jdt.core.compiler.problem.deprecation=warning
     17org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
     18org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
     19org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
     20org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
    621org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
     22org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
     23org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
     24org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
     25org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
     26org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
     27org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
     28org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
     29org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
     30org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
     31org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
     32org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
     33org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     34org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
     35org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
     36org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
     37org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
     38org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
     39org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
     40org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
     41org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
     42org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
     43org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
     44org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
     45org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
     46org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
     47org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
     48org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
     49org.eclipse.jdt.core.compiler.problem.nullReference=warning
     50org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
     51org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
     52org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
     53org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     54org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
     55org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
     56org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
     57org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
     58org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
     59org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
     60org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
     61org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
     62org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
     63org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
     64org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
     65org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
     66org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
     67org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
     68org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
     69org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     70org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
     71org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
     72org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
     73org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
     74org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
     75org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     76org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
     77org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
     78org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
     79org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
     80org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
     81org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
     82org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
     83org.eclipse.jdt.core.compiler.problem.unusedImport=warning
     84org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
     85org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
     86org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
     87org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
     88org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
     89org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
     90org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
     91org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
     92org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
     93org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
     94org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    795org.eclipse.jdt.core.compiler.source=1.7

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

    r31882 r31909  
    55import java.util.Calendar;
    66import java.util.Date;
    7 import java.util.Locale;
    87
    98import org.openstreetmap.josm.Main;

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

    r31883 r31909  
    22package org.openstreetmap.josm.plugins.mapillary;
    33
    4 import java.util.*;
     4import java.util.Collections;
     5import java.util.List;
     6import java.util.Set;
    57import java.util.concurrent.ConcurrentHashMap;
    6 import java.util.concurrent.ConcurrentSkipListSet;
    78import java.util.concurrent.CopyOnWriteArrayList;
    89

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

    r31882 r31909  
    1010import java.io.IOException;
    1111import java.util.ArrayList;
    12 import java.util.List;
    1312import java.util.Set;
    1413import java.util.concurrent.ConcurrentSkipListSet;

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

    r31882 r31909  
    66import java.awt.event.ActionEvent;
    77import java.awt.event.KeyEvent;
    8 import java.beans.beancontext.BeanContextChildComponentProxy;
    98import java.io.File;
    109import java.io.IOException;
    11 import java.util.ArrayList;
    12 import java.util.List;
    1310import java.util.Set;
    1411import java.util.concurrent.ConcurrentSkipListSet;

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

    r31882 r31909  
    88import java.io.File;
    99import java.io.IOException;
    10 import java.util.*;
     10import java.util.ArrayList;
     11import java.util.Collections;
     12import java.util.Comparator;
     13import java.util.List;
    1114import java.util.concurrent.ConcurrentSkipListSet;
    1215
    … …  
    97100      }
    98101      joinImages();
    99       MapillaryRecord.getInstance().addCommand(new CommandImport(new ConcurrentSkipListSet(images)));
     102      MapillaryRecord.getInstance().addCommand(new CommandImport(new ConcurrentSkipListSet<>(images)));
    100103    }
    101104    MapillaryUtils.showAllPictures();

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

    r31805 r31909  
    6666  }
    6767
    68   private void addCheckBoxWithLabel(final JPanel parentPanel, final JCheckBox checkBox,
     68  private static void addCheckBoxWithLabel(final JPanel parentPanel, final JCheckBox checkBox,
    6969      final boolean isSelected, final String iconPath,  final String labelText) {
    7070    final JPanel checkBoxPanel = new JPanel();

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

    r31882 r31909  
    3939import org.openstreetmap.josm.plugins.mapillary.actions.WalkListener;
    4040import org.openstreetmap.josm.plugins.mapillary.actions.WalkThread;
    41 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
    4241import org.openstreetmap.josm.plugins.mapillary.cache.MapillaryCache;
    4342import org.openstreetmap.josm.tools.ImageProvider;

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java

    r31882 r31909  
    55
    66import java.util.HashMap;
    7 import java.util.List;
    87import java.util.Map;
    98import java.util.Set;

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java

    r31882 r31909  
    44import static org.openstreetmap.josm.tools.I18n.trn;
    55
    6 import java.util.List;
    76import java.util.Set;
    87

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandJoin.java

    r31882 r31909  
    3131   */
    3232  public CommandJoin(List<MapillaryAbstractImage> images) {
    33     super(new ConcurrentSkipListSet(images));
     33    super(new ConcurrentSkipListSet<>(images));
    3434    a = images.get(0);
    3535    b = images.get(1);

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandMove.java

    r31882 r31909  
    44import static org.openstreetmap.josm.tools.I18n.trn;
    55
    6 import java.util.List;
    76import java.util.Set;
    87

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandTurn.java

    r31882 r31909  
    44import static org.openstreetmap.josm.tools.I18n.trn;
    55
    6 import java.util.List;
    76import java.util.Set;
    87

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandUnjoin.java

    r31882 r31909  
    55
    66import java.util.List;
    7 import java.util.Set;
    87import java.util.concurrent.ConcurrentSkipListSet;
    98
    … …  
    3231   */
    3332  public CommandUnjoin(List<MapillaryAbstractImage> images) {
    34     super(new ConcurrentSkipListSet(images));
     33    super(new ConcurrentSkipListSet<>(images));
    3534    a = images.get(0);
    3635    b = images.get(1);

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryCommand.java

    r31882 r31909  
    22package org.openstreetmap.josm.plugins.mapillary.history.commands;
    33
    4 import java.util.ArrayList;
    5 import java.util.List;
    64import java.util.Set;
    75import java.util.concurrent.ConcurrentSkipListSet;

  • applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryExecutableCommand.java

    r31882 r31909  
    22package org.openstreetmap.josm.plugins.mapillary.history.commands;
    33
    4 import java.util.List;
    54import java.util.Set;
    65

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

    r31840 r31909  
    2929
    3030  /** Possible download modes. */
    31   public enum MODES {Automatic, Semiautomatic, Manual};
     31  public enum MODES {Automatic, Semiautomatic, Manual}
    3232
    3333  /** All the Threads that have been run. Used to interrupt them properly. */

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

    r31882 r31909  
    114114        }
    115115
    116         MapillaryLayer.getInstance().getData().add(new ConcurrentSkipListSet(finalImages), false);
     116        MapillaryLayer.getInstance().getData().add(new ConcurrentSkipListSet<MapillaryAbstractImage>(finalImages), false);
    117117      }
    118118    } catch (IOException e) {
    … …  
    122122  }
    123123
    124   private boolean isInside(MapillaryAbstractImage image) {
     124  private static boolean isInside(MapillaryAbstractImage image) {
    125125    for (Bounds b : MapillaryLayer.getInstance().getData().bounds) {
    126126      if (b.contains(image.getLatLon())) {

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

    r31882 r31909  
    88import java.awt.event.InputEvent;
    99import java.awt.event.MouseEvent;
    10 import java.util.ArrayList;
    1110import java.util.concurrent.ConcurrentSkipListSet;
    1211
    … …  
    8685                .indexOf(this.lastClicked);
    8786        if (i < j)
    88           this.data.addMultiSelectedImage(new ConcurrentSkipListSet(this.closest.getSequence()
     87          this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence()
    8988                  .getImages().subList(i, j + 1)));
    9089        else
    91           this.data.addMultiSelectedImage(new ConcurrentSkipListSet(this.closest.getSequence()
     90          this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence()
    9291                  .getImages().subList(j, i + 1)));
    9392      }

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

    r31882 r31909  
    99import java.io.OutputStream;
    1010import java.util.HashMap;
    11 import java.util.List;
    1211import java.util.Set;
    1312import java.util.UUID;
    … …  
    180179    exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
    181180    exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
    182             ((MapillaryImportedImage) image).getDate("yyyy/MM/dd HH:mm:ss"));
     181            image.getDate("yyyy/MM/dd HH:mm:ss"));
    183182
    184183    // Removes the ImageDescription tag, that causes problems in the upload.
    … …  
    275274   */
    276275  public static void uploadSequence(MapillarySequence sequence, boolean delete) {
    277     Main.worker.submit(new SequenceUploadThread(new ConcurrentSkipListSet(sequence.getImages()), delete));
     276    Main.worker.submit(new SequenceUploadThread(new ConcurrentSkipListSet<>(sequence.getImages()), delete));
    278277  }
    279278}

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

    r31882 r31909  
    4545
    4646    this.data = new MapillaryData();
    47     this.data.add(new ConcurrentSkipListSet(this.seq.getImages()));
     47    this.data.add(new ConcurrentSkipListSet<>(this.seq.getImages()));
    4848  }
    4949
    … …  
    6060    this.data.add(this.img1);
    6161    assertEquals(1, this.data.getImages().size());
    62     this.data.add(new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[] { this.img2,
     62    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img2,
    6363        this.img3 })));
    6464    assertEquals(3, this.data.getImages().size());
    65     this.data.add(new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[] { this.img3,
     65    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img3,
    6666        this.img4 })));
    6767    assertEquals(4, this.data.getImages().size());

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

    r31823 r31909  
    5656  }
    5757
    58   private Object getPrivateField(MapillaryPreferenceSetting object, String name) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
     58  private static Object getPrivateField(MapillaryPreferenceSetting object, String name) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
    5959    Field field = object.getClass().getDeclaredField(name);
    6060    field.setAccessible(true);

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

    r31882 r31909  
    1616import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
    1717import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
    18 import org.openstreetmap.josm.plugins.mapillary.history.MapillaryRecord;
    1918import org.openstreetmap.josm.plugins.mapillary.history.commands.CommandDelete;
    2019import org.openstreetmap.josm.plugins.mapillary.history.commands.CommandImport;
    … …  
    5655  public void commandTest() {
    5756    MapillaryCommand cmd12 = new CommandMove(
    58             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     57            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
    5958            0.1, 0.1);
    6059    MapillaryCommand cmd23 = new CommandMove(
    61             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})),
     60            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})),
    6261            0.1, 0.1);
    6362    MapillaryCommand cmd13 = new CommandMove(
    64             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img3})),
     63            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img3})),
    6564            0.1, 0.1);
    6665    MapillaryCommand cmd1 = new CommandMove(
    67             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1})), 0.1, 0.1);
     66            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1})), 0.1, 0.1);
    6867    MapillaryCommand cmd31 = new CommandMove(
    69             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img3, this.img1})),
     68            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img3, this.img1})),
    7069            0.2, 0.2);
    7170    this.record.addCommand(cmd12);
    … …  
    112111  public void commandMoveTest() {
    113112    CommandMove cmd1 = new CommandMove(
    114             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     113            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
    115114            0.1, 0.1);
    116115    CommandMove cmd2 = new CommandMove(
    117             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     116            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
    118117            0.1, 0.1);
    119118
    … …  
    146145  public void commandTurnTest() {
    147146    CommandTurn cmd1 = new CommandTurn(
    148             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     147            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
    149148            0.2);
    150149    CommandTurn cmd2 = new CommandTurn(
    151             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
     150            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
    152151            0.1);
    153152
    … …  
    253252
    254253    CommandDelete cmd1 = new CommandDelete(
    255             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
     254            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
    256255    CommandDelete cmd2 = new CommandDelete(
    257             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
     256            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
    258257
    259258    this.record.addCommand(join1);
    … …  
    264263            .getData()
    265264            .add(
    266                     new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2,
     265                    new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2,
    267266                            this.img3})));
    268267
    … …  
    286285
    287286    CommandImport cmd1 = new CommandImport(
    288             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
     287            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
    289288    CommandImport cmd2 = new CommandImport(
    290             new ConcurrentSkipListSet(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
     289            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
    291290
    292291    this.record.addCommand(cmd1);

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

    r31793 r31909  
    11package org.openstreetmap.josm.plugins.mapillary.traffico;
    22
    3 import static org.junit.Assert.*;
     3import static org.junit.Assert.assertEquals;
     4import static org.junit.Assert.assertNotNull;
    45
    56import java.awt.Color;
    … …  
    2122  @Test(expected=IllegalArgumentException.class)
    2223  public void testNullColor() {
    23     new TrafficoSignElement('\ufeed', null);
     24    assertNotNull(new TrafficoSignElement('\ufeed', null));
    2425  }
    2526

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

    r31833 r31909  
    183183  }
    184184
    185   private void assertUrlEquals(URL actualUrl, String expectedBaseUrl, String... expectedParams) {
     185  private static void assertUrlEquals(URL actualUrl, String expectedBaseUrl, String... expectedParams) {
    186186    assertEquals(expectedBaseUrl, actualUrl.toString().substring(0, actualUrl.toString().indexOf('?')));
    187187    String[] actualParams = actualUrl.getQuery().split("&");
Note: See TracChangeset for help on using the changeset viewer.