[josm-plugins] 01/07: Imported Upstream version 0.0.svn32928+ds
Bas Couwenberg
sebastic at debian.org
Tue Sep 6 09:02:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm-plugins.
commit 1a4315217046018bfc9ccabad04860d5ee0042d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Sep 6 09:33:04 2016 +0200
Imported Upstream version 0.0.svn32928+ds
---
build-common.xml | 27 +++++++++++-----------
lakewalker/.settings/org.eclipse.jdt.ui.prefs | 9 ++++++--
.../josm/plugins/lakewalker/BooleanConfigurer.java | 1 +
.../josm/plugins/lakewalker/DoubleConfigurer.java | 2 +-
.../josm/plugins/lakewalker/LakewalkerAction.java | 12 ++++++----
.../plugins/lakewalker/LakewalkerPreferences.java | 4 ++++
.../plugins/lakewalker/StringEnumConfigurer.java | 1 +
svn-info.xml | 8 +++----
8 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/build-common.xml b/build-common.xml
index 5e3e2e7..991a0f1 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -14,8 +14,7 @@
<property name="josm" location="../../core/dist/josm-custom.jar"/>
<property name="josm.test.build.dir" location="../../core/test/build"/>
- <property name="groovy.jar" location="../00_core_tools/groovy-all-2.4.7.jar"/>
- <property name="error_prone_ant.jar" location="../00_core_tools/error_prone_ant-2.0.11.jar"/>
+ <property name="error_prone_ant.jar" location="../00_core_tools/error_prone_ant-2.0.12.jar"/>
<property name="checkstyle.jar" location="../00_core_tools/checkstyle/checkstyle-7.1-all.jar"/>
<property name="findbugs-ant.jar" location="../00_core_tools/findbugs/findbugs-ant.jar"/>
<property name="annotations.jar" location="../00_core_tools/findbugs/annotations.jar"/>
@@ -34,11 +33,15 @@
<condition property="isWindows">
<os family="Windows"/>
</condition>
- <target name="-jaxb_win" if="isWindows">
- <property name="xjc" value="${java.home}\..\bin\xjc.exe" />
+ <!-- For Java9-specific stuff -->
+ <condition property="isJava9">
+ <equals arg1="${ant.java.version}" arg2="1.9" />
+ </condition>
+ <target name="-jaxb_before9" unless="isJava9">
+ <property name="xjc" value="${java.home}${file.separator}..${file.separator}bin${file.separator}xjc" />
</target>
- <target name="-jaxb_nix" unless="isWindows">
- <property name="xjc" value="${java.home}/../bin/xjc" />
+ <target name="-jaxb_after9" if="isJava9">
+ <property name="xjc" value="${java.home}${file.separator}bin${file.separator}xjc" />
</target>
<!-- To be overriden in plugin build file before inclusion if other plugins are required -->
@@ -433,7 +436,6 @@
<pathelement path="${josm.test.build.dir}/unit"/>
<pathelement path="${josm}"/>
<pathelement path="${plugin.jar}"/>
- <pathelement path="${groovy.jar}"/>
<pathelement path="${annotations.jar}"/>
</path>
<macrodef name="init-test-preferences">
@@ -460,18 +462,15 @@
<delete dir="../00_core_test_config/unit-josm.home/cache" failonerror="false"/>
</target>
<target name="test-compile" depends="test-init,dist" if="test.present">
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/>
<sequential>
- <groovyc srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8">
+ <javac debug="on" srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8">
<classpath>
<fileset refid="plugin.requires.jars"/>
<path refid="test.classpath"/>
</classpath>
- <javac debug="on" encoding="UTF-8">
- <compilerarg value="-Xlint:all"/>
- <compilerarg value="-Xlint:-serial"/>
- </javac>
- </groovyc>
+ <compilerarg value="-Xlint:all"/>
+ <compilerarg value="-Xlint:-serial"/>
+ </javac>
</sequential>
</target>
<target name="test" depends="dist, test-clean, test-compile" if="test.present"
diff --git a/lakewalker/.settings/org.eclipse.jdt.ui.prefs b/lakewalker/.settings/org.eclipse.jdt.ui.prefs
index dd6f6e0..821f89a 100644
--- a/lakewalker/.settings/org.eclipse.jdt.ui.prefs
+++ b/lakewalker/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Sun Jan 24 21:18:20 CET 2010
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
sp_cleanup.add_default_serial_version_id=true
@@ -8,15 +7,18 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -32,12 +34,13 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
@@ -45,8 +48,10 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java
index e6d3a65..c243fcb 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java
@@ -64,6 +64,7 @@ public class BooleanConfigurer extends Configurer {
box = new javax.swing.JCheckBox(getName());
box.setSelected(booleanValue().booleanValue());
box.addItemListener(new java.awt.event.ItemListener() {
+ @Override
public void itemStateChanged(java.awt.event.ItemEvent e) {
setValue(box.isSelected());
}
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java
index 327127f..c76bafd 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java
@@ -11,7 +11,7 @@ public class DoubleConfigurer extends StringConfigurer {
}
public DoubleConfigurer(String key, String name) {
- this(key, name, new Double(0));
+ this(key, name, 0d);
}
public DoubleConfigurer(String key, String name, Double val) {
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
index 760e441..dd8564e 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
@@ -57,6 +57,7 @@ class LakewalkerAction extends JosmAction implements MouseListener {
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (Main.map == null || Main.map.mapView == null || active)
return;
@@ -82,11 +83,7 @@ class LakewalkerAction extends JosmAction implements MouseListener {
File[] wmsCache = wmsCacheDir.listFiles();
// sort files by date (most recent first)
- Arrays.sort(wmsCache, new Comparator<File>() {
- public int compare(File f1, File f2) {
- return (int) (f2.lastModified()-f1.lastModified());
- }
- });
+ Arrays.sort(wmsCache, Comparator.comparingLong(File::lastModified));
// delete aged or oversized, keep newest. Once size/age limit was reached delete all older files
long folderSize = 0;
@@ -295,6 +292,7 @@ class LakewalkerAction extends JosmAction implements MouseListener {
cancel = true;
}
+ @Override
public void mouseClicked(MouseEvent e) {
if (active) {
active = false;
@@ -304,15 +302,19 @@ class LakewalkerAction extends JosmAction implements MouseListener {
}
}
+ @Override
public void mouseEntered(MouseEvent e) {
}
+ @Override
public void mouseExited(MouseEvent e) {
}
+ @Override
public void mousePressed(MouseEvent e) {
}
+ @Override
public void mouseReleased(MouseEvent e) {
}
}
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java
index 3555d52..adc0835 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java
@@ -72,7 +72,9 @@ public class LakewalkerPreferences extends DefaultTabPreferenceSetting {
super("lakewalker.png", I18n.tr("Lakewalker Plugin Preferences"), tr("A plugin to trace water bodies on Landsat imagery."));
}
+ @Override
public void addGui(PreferenceTabbedPane gui) {
+ //CHECKSTYLE.OFF: LineLength
maxSegsConfig.setToolTipText(tr("Maximum number of segments allowed in each generated way. Default 250."));
maxNodesConfig.setToolTipText(tr("Maximum number of nodes to generate before bailing out (before simplifying lines). Default 50000."));
thresholdConfig.setToolTipText(tr("Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Default 90."));
@@ -87,6 +89,7 @@ public class LakewalkerPreferences extends DefaultTabPreferenceSetting {
maxCacheSizeConfig.setToolTipText(tr("Maximum size of each cache directory in bytes. Default is 300MB"));
maxCacheAgeConfig.setToolTipText(tr("Maximum age of each cached file in days. Default is 100"));
sourceConfig.setToolTipText(tr("Data source text. Default is Landsat."));
+ //CHECKSTYLE.ON: LineLength
/*String description =*/ tr("A plugin to trace water bodies on Landsat imagery.");
JPanel prefPanel = gui.createPreferenceTab(this);
@@ -147,6 +150,7 @@ public class LakewalkerPreferences extends DefaultTabPreferenceSetting {
/*
* Save entered preference values on OK button
*/
+ @Override
public boolean ok() {
Main.pref.put(PREF_MAX_SEG, maxSegsConfig.getValueString());
Main.pref.put(PREF_MAX_NODES, maxNodesConfig.getValueString());
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java
index 30f421e..5584a9f 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java
@@ -49,6 +49,7 @@ public class StringEnumConfigurer extends Configurer {
box.setMaximumSize(new Dimension(box.getMaximumSize().width, box.getPreferredSize().height));
setValue(value);
box.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
noUpdate = true;
setValue(box.getSelectedIndex());
diff --git a/svn-info.xml b/svn-info.xml
index 187e889..0e6edfc 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -3,7 +3,7 @@
<entry
kind="dir"
path="plugins"
- revision="32805">
+ revision="32928">
<url>https://svn.openstreetmap.org/applications/editors/josm/plugins</url>
<relative-url>^/applications/editors/josm/plugins</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
</repository>
<commit
- revision="32804">
-<author>darya</author>
-<date>2016-08-12T11:14:04.855337Z</date>
+ revision="32927">
+<author>donvip</author>
+<date>2016-09-04T16:05:38.537038Z</date>
</commit>
</entry>
</info>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list