Skip to content

Commit

Permalink
Version 0.4
Browse files Browse the repository at this point in the history
Version for Java 8
Used commits of other users in josm repository
  • Loading branch information
bwr57 committed Aug 19, 2016
1 parent 5a6e798 commit 4e1be67
Show file tree
Hide file tree
Showing 68 changed files with 24 additions and 705 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="C:/Rodsoft/java/workspace/svn/trunk/dist/josm-custom.jar" sourcepath="C:/Rodsoft/java/workspace/svn/trunk/dist/josm-custom.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
7 changes: 6 additions & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>josmPlugins</name>
<name>JOSM-CustomizePublicTransportStop</name>
<comment>JavaCC Nature</comment>
<projects>
</projects>
Expand All @@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
Expand Down
6 changes: 3 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
# the current plugin version. Increment if you create a new build to be rolled out
# via the OSM subversion repository
#
plugin.version=0.1.2
plugin.version=0.4

# the lowest JOSM version the curent plugin version is compatible with
#
josm.required.version=7171
josm.required.version=10353

# the full path to the JOSM jar against which this plugin is built
#
Expand Down
19 changes: 10 additions & 9 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="josm-CustomizePublicTransportStop-plugin" default="dist" basedir=".">

<property name="ant.build.javac.target" value="1.7"/>
<property name="ant.build.javac.source" value="1.7"/>
<property name="ant.build.javac.target" value="1.8"/>
<property name="ant.build.javac.source" value="1.8"/>

<property name="plugin.build.dir" value="build" />
<property name="plugin.src.dir" value="src" />
<property name="plugin.dist.dir" value="../../dist" />
<property name="plugin.jar" value="${plugin.dist.dir}/CustomizePublicTransportStop.jar" />
<property name="josm" location="../../dist/josm-custom.jar"/>
<property name="josm" location="../../core/dist/josm-custom.jar"/>

<target name="init">
<available file="build.properties" property="build.properties.present" />
Expand All @@ -21,9 +21,6 @@

<path id="compile.path">
<pathelement location="${josm}" />
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
</path>

<mkdir dir="${plugin.build.dir}" />
Expand Down Expand Up @@ -69,11 +66,11 @@
<attribute name="Author" value="Rodion Scherbakov" />
<attribute name="Plugin-Class" value="ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop.CustomizePublicTransportStopPlugin" />
<attribute name="Plugin-Date" value="${plugin.build.date}" />
<attribute name="Plugin-Description" value="(Warning: Experimental!) Customizing of public public transport stops." />
<attribute name="Plugin-Description" value="Customization of public public transport stops." />
<attribute name="Plugin-Icon" value="images/bus.png"/>
<attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/CustomizePublicTransportStop" />
<attribute name="Plugin-Mainversion" value="${josm.required.version}" />
<attribute name="Plugin-Version" value="0.2" />
<attribute name="Plugin-Version" value="0.4" />
<attribute name="RU_Plugin-Description" value="Настройка остановки общественного транспорта в соответствии со стандартом" />
</manifest>
</jar>
Expand All @@ -95,5 +92,9 @@
<target name="dev-install" depends="dist">
<echo>Installing the plugin in ${local.install.path}</echo>
<copy file="${plugin.jar}" todir="C:\Users\bwr57_000\AppData\Roaming\JOSM\plugins" />
</target>
</target>

<target name="test"/>
<target name="checkstyle"/>
<target name="findbugs"/>
</project>
Loading

0 comments on commit 4e1be67

Please sign in to comment.