Skip to content

Commit d7c5808

Browse files
don-vipdon-vip
committed
code cleanup, update to latest JOSM
1 parent e275af2 commit d7c5808

12 files changed

+346
-353
lines changed

‎.checkstyle

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
5+
<additional-data name="protect-config-file" value="false"/>
6+
</local-check-config>
7+
<fileset name="all" enabled="true" check-config-name="JOSM" local="true">
8+
<file-match-pattern match-pattern="." include-pattern="true"/>
9+
</fileset>
10+
<filter name="DerivedFiles" enabled="true"/>
11+
<filter name="FilesFromPackage" enabled="true">
12+
<filter-data value=".svn"/>
13+
<filter-data value="data"/>
14+
<filter-data value="images"/>
15+
<filter-data value="resources"/>
16+
<filter-data value="styles"/>
17+
<filter-data value="scripts"/>
18+
</filter>
19+
</fileset-config>

‎.classpath

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="test/src"/>
5-
<!-- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7-
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
8-
<classpathentry kind="lib" path="/JOSM/dist/josm-custom.jar" sourcepath="/JOSM/src"/>
9-
<classpathentry kind="lib" path="/JOSM/test/build" sourcepath="/JOSM/test/functional"/>
10-
<classpathentry kind="lib" path="test/config"/>
11-
<classpathentry kind="output" path="build"/> -->
4+
<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6+
<classpathentry kind="output" path="bin"/>
127
</classpath>

‎.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>JOSM-rex</name>
4+
<comment></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>net.sf.eclipsecs.core.CheckstyleBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
22+
</natures>
23+
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs

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

‎.settings/org.eclipse.jdt.ui.prefs

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
eclipse.preferences.version=1
2+
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
3+
sp_cleanup.add_default_serial_version_id=true
4+
sp_cleanup.add_generated_serial_version_id=false
5+
sp_cleanup.add_missing_annotations=true
6+
sp_cleanup.add_missing_deprecated_annotations=true
7+
sp_cleanup.add_missing_methods=false
8+
sp_cleanup.add_missing_nls_tags=false
9+
sp_cleanup.add_missing_override_annotations=true
10+
sp_cleanup.add_missing_override_annotations_interface_methods=true
11+
sp_cleanup.add_serial_version_id=false
12+
sp_cleanup.always_use_blocks=true
13+
sp_cleanup.always_use_parentheses_in_expressions=false
14+
sp_cleanup.always_use_this_for_non_static_field_access=false
15+
sp_cleanup.always_use_this_for_non_static_method_access=false
16+
sp_cleanup.convert_functional_interfaces=false
17+
sp_cleanup.convert_to_enhanced_for_loop=false
18+
sp_cleanup.correct_indentation=true
19+
sp_cleanup.format_source_code=false
20+
sp_cleanup.format_source_code_changes_only=false
21+
sp_cleanup.insert_inferred_type_arguments=false
22+
sp_cleanup.make_local_variable_final=true
23+
sp_cleanup.make_parameters_final=false
24+
sp_cleanup.make_private_fields_final=true
25+
sp_cleanup.make_type_abstract_if_missing_method=false
26+
sp_cleanup.make_variable_declarations_final=false
27+
sp_cleanup.never_use_blocks=false
28+
sp_cleanup.never_use_parentheses_in_expressions=true
29+
sp_cleanup.on_save_use_additional_actions=true
30+
sp_cleanup.organize_imports=true
31+
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
32+
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
33+
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
34+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
35+
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
36+
sp_cleanup.remove_private_constructors=true
37+
sp_cleanup.remove_redundant_type_arguments=false
38+
sp_cleanup.remove_trailing_whitespaces=true
39+
sp_cleanup.remove_trailing_whitespaces_all=true
40+
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
41+
sp_cleanup.remove_unnecessary_casts=true
42+
sp_cleanup.remove_unnecessary_nls_tags=false
43+
sp_cleanup.remove_unused_imports=true
44+
sp_cleanup.remove_unused_local_variables=false
45+
sp_cleanup.remove_unused_private_fields=true
46+
sp_cleanup.remove_unused_private_members=false
47+
sp_cleanup.remove_unused_private_methods=true
48+
sp_cleanup.remove_unused_private_types=true
49+
sp_cleanup.sort_members=false
50+
sp_cleanup.sort_members_all=false
51+
sp_cleanup.use_anonymous_class_creation=false
52+
sp_cleanup.use_blocks=false
53+
sp_cleanup.use_blocks_only_for_return_and_throw=false
54+
sp_cleanup.use_lambda=true
55+
sp_cleanup.use_parentheses_in_expressions=false
56+
sp_cleanup.use_this_for_non_static_field_access=false
57+
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
58+
sp_cleanup.use_this_for_non_static_method_access=false
59+
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

‎README.template

-95
This file was deleted.

‎build.number

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#Build Number for ANT. Do not edit!
2-
#Sun Nov 01 00:37:00 CET 2015
3-
build.number=1906
1+
#Build Number for ANT. Do not edit!
2+
#Thu Oct 06 02:06:21 CEST 2016
3+
build.number=1952

‎build.xml

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
** This is a template build file for a JOSM plugin.
4-
**
5-
** Maintaining versions
6-
** ====================
7-
** See README.template
8-
**
9-
** Usage
10-
** =====
11-
** Call "ant help" to get possible build targets.
12-
**
13-
-->
142
<project name="rex" default="dist" basedir=".">
153
<!-- enter the SVN commit message -->
164
<property name="commit.message" value="Commit message"/>
175
<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
18-
<property name="plugin.main.version" value="7001"/>
6+
<property name="plugin.main.version" value="10580"/>
197

208
<!-- Configure these properties (replace "..." accordingly).
219
See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
2210
-->
2311
<property name="plugin.description" value="Expand a simple intersection to a roundabout in gradual steps. Select an intersection node or a roundabout and press Crtl-Shift-R"/>
2412
<property name="plugin.author" value="Gorm Egeberg Johnsen"/>
25-
<property name="plugin.version" value="v0.0.1"/>
13+
<property name="plugin.version" value="v1.0"/>
2614
<property name="plugin.class" value="org.openstreetmap.josm.plugins.rex.RoundaboutExpanderPlugin"/>
2715
<!--<property name="plugin.early" value="..."/>-->
2816
<property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/RoundaboutExpander"/>

0 commit comments

Comments
 (0)