Changeset 32340 in osm


Ignore:
Timestamp:
2016-06-20T17:21:18+02:00 (8 years ago)
Author:
floscher
Message:

Tweak settings for Eclipse and IntelliJ idea

  • put code style settings for IntelliJ under version control
  • set target platform to 1.8 in Eclipse
  • add Gradle nature to Eclipse project
Location:
applications/editors/josm/plugins/mapillary
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r31882 r32340  
     1# Eclipse
    12/.classpath
    23/.project
    3 /bin
     4/bin/
     5
     6# IntelliJ idea
     7/*.iml
     8/*.iws
     9/*.ipr
     10/out/
     11/.idea/*
     12!/.idea/codeStyleSettings.xml
     13
     14# Gradle
    415/build/
    516/.gradle/
    6 /.settings
     17
    718/test/data/preferences/
    8 *.iml
    9 .idea/

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

    r32286 r32340  
    33        <name>JOSM-Mapillary</name>
    44        <comment>Allows the user to work with pictures hosted at mapillary.com</comment>
    5         <projects>
    6         </projects>
    7         <buildSpec>
    8                 <buildCommand>
    9                         <name>org.eclipse.jdt.core.javabuilder</name>
    10                         <arguments>
    11                         </arguments>
    12                 </buildCommand>
    13                 <buildCommand>
    14                         <name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
    15                         <arguments>
    16                         </arguments>
    17                 </buildCommand>
    18                 <buildCommand>
    19                         <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
    20                         <arguments>
    21                         </arguments>
    22                 </buildCommand>
    23         </buildSpec>
     5        <projects/>
    246        <natures>
    257                <nature>org.eclipse.jdt.core.javanature</nature>
    268                <nature>org.sonarlint.eclipse.core.sonarlintNature</nature>
    279                <nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
     10                <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
    2811        </natures>
     12        <buildSpec>
     13                <buildCommand>
     14                        <name>org.eclipse.jdt.core.javabuilder</name>
     15                        <arguments/>
     16                </buildCommand>
     17                <buildCommand>
     18                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
     19                        <arguments/>
     20                </buildCommand>
     21                <buildCommand>
     22                        <name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
     23                        <arguments/>
     24                </buildCommand>
     25                <buildCommand>
     26                        <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
     27                        <arguments/>
     28                </buildCommand>
     29        </buildSpec>
     30        <linkedResources/>
    2931</projectDescription>

  • applications/editors/josm/plugins/mapillary/.settings/Build JOSM-Mapillary.launch

    r31817 r32340  
    1515    <listEntry value="javadoc"/>
    1616  </listAttribute>
    17   <stringAttribute key="working_dir" value="${workspace_loc:/JOSM-Mapillary}"/>
     17  <stringAttribute key="working_dir" value="${project_loc}"/>
    1818</launchConfiguration>

  • applications/editors/josm/plugins/mapillary/.settings/Launch JOSM with JOSM-Mapillary loaded.launch

    r31798 r32340  
    1313    <listEntry value="runJosm"/>
    1414  </listAttribute>
    15   <stringAttribute key="working_dir" value="${workspace_loc:/JOSM-Mapillary}"/>
     15  <stringAttribute key="working_dir" value="${project_loc}"/>
    1616</launchConfiguration>

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

    r32203 r32340  
    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.7
    10 org.eclipse.jdt.core.compiler.compliance=1.7
     9org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
     10org.eclipse.jdt.core.compiler.compliance=1.8
    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.7
     96org.eclipse.jdt.core.compiler.source=1.8

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

    r32335 r32340  
    11apply plugin: 'eclipse'
    22apply plugin: 'findbugs'
     3apply plugin: 'idea'
    34apply plugin: 'jacoco'
    45apply plugin: 'java'
    … …  
    6667    name = 'JOSM-Mapillary'
    6768    comment = property('plugin.description')
    68     natures 'org.sonarlint.eclipse.core.sonarlintNature', 'ch.acanda.eclipse.pmd.builder.PMDNature'
     69    natures 'org.sonarlint.eclipse.core.sonarlintNature', 'ch.acanda.eclipse.pmd.builder.PMDNature', 'org.eclipse.buildship.core.gradleprojectnature'
     70    buildCommand 'org.sonarlint.eclipse.core.sonarlintBuilder'
    6971    buildCommand 'ch.acanda.eclipse.pmd.builder.PMDBuilder'
     72    buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
    7073  }
    7174}
Note: See TracChangeset for help on using the changeset viewer.