This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository jmapviewer.

commit dbc1d71bae3831e90ada7dc0ef728e9624f490a2
Author: Andreas Tille <ti...@debian.org>
Date:   Tue Jul 8 09:48:14 2014 +0200

    Imported Upstream version 1.03+dfsg
---
 .classpath                                         |   6 -
 .project                                           |  17 --
 .settings/org.eclipse.core.resources.prefs         |   3 -
 .settings/org.eclipse.jdt.core.prefs               | 280 ---------------------
 .settings/org.eclipse.jdt.ui.prefs                 |   8 -
 releases/1.0/JMapViewer-1.0-Source.zip             | Bin 99256 -> 0 bytes
 releases/1.0/JMapViewer-1.0.zip                    | Bin 222809 -> 0 bytes
 releases/1.01/JMapViewer-1.01-Source.zip           | Bin 99402 -> 0 bytes
 releases/1.01/JMapViewer-1.01.zip                  | Bin 222797 -> 0 bytes
 releases/1.02/JMapViewer-1.02-Source.zip           | Bin 99405 -> 0 bytes
 releases/1.02/JMapViewer-1.02.zip                  | Bin 222769 -> 0 bytes
 .../gui/jmapviewer/DefaultMapController.java       |  24 +-
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   |   2 +
 .../tilesources/AbstractOsmTileSource.java         |   6 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |  25 +-
 .../tilesources/TemplatedTMSTileSource.java        |   2 +-
 16 files changed, 47 insertions(+), 326 deletions(-)

diff --git a/.classpath b/.classpath
deleted file mode 100644
index d171cd4..0000000
--- a/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index b18095b..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>OSM</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs 
b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 80b990a..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jul 16 10:49:16 CEST 2008
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs 
b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3408a14..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,280 +0,0 @@
-#Sun Jan 31 13:16:40 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-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.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=false
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=false
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not 
insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 
insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do 
not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do 
not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do 
not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not 
insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do 
not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do 
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not 
insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do
 not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do
 not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/.settings/org.eclipse.jdt.ui.prefs 
b/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index d6d3a9b..0000000
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Sun Jan 31 13:16:40 CET 2010
-eclipse.preferences.version=1
-formatter_profile=_JOSM
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/releases/1.0/JMapViewer-1.0-Source.zip 
b/releases/1.0/JMapViewer-1.0-Source.zip
deleted file mode 100644
index eed7909..0000000
Binary files a/releases/1.0/JMapViewer-1.0-Source.zip and /dev/null differ
diff --git a/releases/1.0/JMapViewer-1.0.zip b/releases/1.0/JMapViewer-1.0.zip
deleted file mode 100644
index f0b0ba9..0000000
Binary files a/releases/1.0/JMapViewer-1.0.zip and /dev/null differ
diff --git a/releases/1.01/JMapViewer-1.01-Source.zip 
b/releases/1.01/JMapViewer-1.01-Source.zip
deleted file mode 100644
index e67f77b..0000000
Binary files a/releases/1.01/JMapViewer-1.01-Source.zip and /dev/null differ
diff --git a/releases/1.01/JMapViewer-1.01.zip 
b/releases/1.01/JMapViewer-1.01.zip
deleted file mode 100644
index 99a89d8..0000000
Binary files a/releases/1.01/JMapViewer-1.01.zip and /dev/null differ
diff --git a/releases/1.02/JMapViewer-1.02-Source.zip 
b/releases/1.02/JMapViewer-1.02-Source.zip
deleted file mode 100644
index 241110f..0000000
Binary files a/releases/1.02/JMapViewer-1.02-Source.zip and /dev/null differ
diff --git a/releases/1.02/JMapViewer-1.02.zip 
b/releases/1.02/JMapViewer-1.02.zip
deleted file mode 100644
index 6536932..0000000
Binary files a/releases/1.02/JMapViewer-1.02.zip and /dev/null differ
diff --git a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java 
b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
index a37929b..93e04be 100644
--- a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
+++ b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
@@ -39,10 +39,14 @@ MouseWheelListener {
     private boolean doubleClickZoomEnabled = true;
 
     public void mouseDragged(MouseEvent e) {
+        debugMouseEvent("DefaultMapController.mouseDragged", e);
         if (!movementEnabled || !isMoving)
             return;
         // Is only the selected mouse button pressed?
-        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == 
movementMouseButtonMask) {
+        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == 
movementMouseButtonMask || isPlatformOsx() && e.getModifiersEx() == 
MAC_MOUSE_BUTTON3_MASK) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  moving");
+            }
             Point p = e.getPoint();
             if (lastDragPoint != null) {
                 int diffx = lastDragPoint.x - p.x;
@@ -54,25 +58,41 @@ MouseWheelListener {
     }
 
     public void mouseClicked(MouseEvent e) {
+        debugMouseEvent("DefaultMapController.mouseClicked", e);
         if (doubleClickZoomEnabled && e.getClickCount() == 2 && e.getButton() 
== MouseEvent.BUTTON1) {
             map.zoomIn(e.getPoint());
         }
     }
 
     public void mousePressed(MouseEvent e) {
+        debugMouseEvent("DefaultMapController.mousePressed", e);
+       
         if (e.getButton() == movementMouseButton || isPlatformOsx() && 
e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  move start");
+            }
             lastDragPoint = null;
             isMoving = true;
         }
     }
-
+    
     public void mouseReleased(MouseEvent e) {
+        debugMouseEvent("DefaultMapController.mouseReleased", e);
         if (e.getButton() == movementMouseButton || isPlatformOsx() && 
e.getButton() == MouseEvent.BUTTON1) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  move stop");
+            }
             lastDragPoint = null;
             isMoving = false;
         }
     }
 
+    public void debugMouseEvent(String s, MouseEvent e) {
+        if (JMapViewer.debug) {
+            System.err.println("(#9897) " + s + ": Button "+ e.getButton() + " 
Modifiers: " +Integer.toBinaryString(e.getModifiersEx()));
+        }
+    }
+    
     public void mouseWheelMoved(MouseWheelEvent e) {
         if (wheelZoomEnabled) {
             map.setZoom(map.getZoom() - e.getWheelRotation(), e.getPoint());
diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java 
b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
index 368a90f..52610f3 100644
--- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
+++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
@@ -43,6 +43,8 @@ import 
org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 public class JMapViewer extends JPanel implements TileLoaderListener {
 
     private static final long serialVersionUID = 1L;
+    
+    public static boolean debug = false;
 
     /**
      * Vectors for clock-wise tile painting
diff --git 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
index 518c400..edf1729 100644
--- 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
+++ 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
@@ -11,7 +11,7 @@ import org.openstreetmap.gui.jmapviewer.Coordinate;
 public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
     
     /**
-     * The OSM attribution. Must be always in line with <a 
href="http://www.openstreetmap.org/copyright/en";>http://www.openstreetmap.org/copyright/en</a>
+     * The OSM attribution. Must be always in line with <a 
href="https://www.openstreetmap.org/copyright/en";>https://www.openstreetmap.org/copyright/en</a>
      */
     public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap 
contributors";
     
@@ -40,7 +40,7 @@ public abstract class AbstractOsmTileSource extends 
AbstractTMSTileSource {
 
     @Override
     public String getAttributionLinkURL() {
-        return "http://openstreetmap.org/";;
+        return "https://openstreetmap.org/";;
     }
 
     @Override
@@ -60,6 +60,6 @@ public abstract class AbstractOsmTileSource extends 
AbstractTMSTileSource {
 
     @Override
     public String getTermsOfUseURL() {
-        return "http://www.openstreetmap.org/copyright";;
+        return "https://www.openstreetmap.org/copyright";;
     }
 }
diff --git 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
index 3d6bf70..8ec5dbc 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
@@ -7,20 +7,33 @@ package org.openstreetmap.gui.jmapviewer.tilesources;
 public class OsmTileSource {
 
     /**
-     * The default "Mapnik" OSM tile source URL
-     */
-    public static final String MAP_MAPNIK = "http://tile.openstreetmap.org";;
-
-    /**
      * The default "Mapnik" OSM tile source.
      */
     public static class Mapnik extends AbstractOsmTileSource {
+
+        private static final String PATTERN = 
"https://%s.tile.openstreetmap.org";;
+
+        private static final String[] SERVER = { "a", "b", "c" };
+
+        private int SERVER_NUM = 0;
         
         /**
          * Constructs a new {@code "Mapnik"} tile source.
          */
         public Mapnik() {
-            super("Mapnik", MAP_MAPNIK);
+            super("Mapnik", PATTERN);
+        }
+
+        @Override
+        public String getBaseUrl() {
+            String url = String.format(this.baseUrl, new Object[] { 
SERVER[SERVER_NUM] });
+            SERVER_NUM = (SERVER_NUM + 1) % SERVER.length;
+            return url;
+        }
+
+        @Override
+        public int getMaxZoom() {
+            return 19;
         }
 
         public TileUpdate getTileUpdate() {
diff --git 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
index 9113813..1296a06 100644
--- 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+++ 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
@@ -13,7 +13,7 @@ public class TemplatedTMSTileSource extends TMSTileSource {
     private String[] randomParts = null;
     private Map<String, String> headers = new HashMap<String, String>();
 
-    public static final String PATTERN_ZOOM    = 
"\\{(?:(\\d+)-)?zoom([+-]\\d+)?\\}";
+    public static final String PATTERN_ZOOM    = 
"\\{(?:(\\d+)-)?z(?:oom)?([+-]\\d+)?\\}";
     public static final String PATTERN_X       = "\\{x\\}";
     public static final String PATTERN_Y       = "\\{y\\}";
     public static final String PATTERN_Y_YAHOO = "\\{!y\\}";

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/jmapviewer.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to