Changeset 32378 in osm


Ignore:
Timestamp:
2016-06-23T02:41:12+02:00 (9 years ago)
Author:
donvip
Message:

switch back to Java 7. Please wait for our go before switching to Java 8.
See https://josm.openstreetmap.de/ticket/11390 for Java 8 migration news

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

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/mapillary/.classpath

    r32285 r32378  
    44        <classpathentry kind="src" path="src"/>
    55        <classpathentry kind="src" path="test/unit"/>
    6         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
     6        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
    77        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
    88        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>

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

    r32354 r32378  
    77org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
    88org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    9 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
    10 org.eclipse.jdt.core.compiler.compliance=1.8
     9org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
     10org.eclipse.jdt.core.compiler.compliance=1.7
    1111org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    1212org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
    … …  
    9494org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
    9595org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    96 org.eclipse.jdt.core.compiler.source=1.8
     96org.eclipse.jdt.core.compiler.source=1.7
    9797org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
    9898org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

  • applications/editors/josm/plugins/mapillary/build.gradle

    r32340 r32378  
    66apply plugin: 'pmd'
    77
    8 sourceCompatibility = '1.8'
     8sourceCompatibility = '1.7'
    99
    1010repositories {

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

    r32372 r32378  
    250250    }
    251251    if (!SwingUtilities.isEventDispatchThread()) {
    252       SwingUtilities.invokeLater( () -> setMenuEnabled(menu, value));
     252      SwingUtilities.invokeLater( new Runnable() {
     253        @Override
     254        public void run() {
     255          setMenuEnabled(menu, value);
     256        }
     257      });
    253258    } else {
    254259      menu.setEnabled(value);

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

    r32372 r32378  
    134134    }
    135135
    136     new Thread( () -> {
    137       String username = MapillaryUser.getUsername();
    138       if (username != null) {
    139         SwingUtilities.invokeLater( () -> onLogin(MapillaryUser.getUsername()) );
     136    new Thread( new Runnable() {
     137      @Override
     138      public void run() {
     139        String username = MapillaryUser.getUsername();
     140        if (username != null) {
     141          SwingUtilities.invokeLater( new Runnable() {
     142            @Override
     143            public void run() {
     144              onLogin(MapillaryUser.getUsername());
     145            }
     146          } );
     147        }
    140148      }
    141149    }).start();

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

    r32374 r32378  
    193193              tr("The downloaded OSM area is too big. Download mode has been changed to semiautomatic until the layer is restarted."));
    194194    } else {
    195       SwingUtilities.invokeLater( () -> tooBigErrorDialog());
     195      SwingUtilities.invokeLater( new Runnable() {
     196        @Override
     197        public void run() {
     198          tooBigErrorDialog();
     199        }
     200      });
    196201    }
    197202  }

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

    r32372 r32378  
    203203  public static void showPictures(final Set<MapillaryAbstractImage> images, final boolean select) {
    204204    if (!SwingUtilities.isEventDispatchThread()) {
    205       SwingUtilities.invokeLater( () -> showPictures(images, select) );
     205      SwingUtilities.invokeLater( new Runnable() {
     206        @Override
     207        public void run() {
     208          showPictures(images, select);
     209        }
     210      } );
    206211    } else {
    207212      Bounds zoomBounds;

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

    r32372 r32378  
    101101      dlg.setVisible(true);
    102102    } else {
    103       SwingUtilities.invokeLater( () -> finishedUploadDialog() );
     103      SwingUtilities.invokeLater( new Runnable() {
     104        @Override
     105        public void run() {
     106          finishedUploadDialog();
     107        }
     108      } );
    104109    }
    105110  }
Note: See TracChangeset for help on using the changeset viewer.