Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <an...@us...> - 2007-10-30 14:11:56
|
Revision: 684
http://magicmap.svn.sourceforge.net/magicmap/?rev=684&view=rev
Author: anweiss
Date: 2007-10-30 06:16:46 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
Removed Paths:
-------------
tags/V20071030_0_9_1/.classpath
tags/V20071030_0_9_1/.cvsignore
tags/V20071030_0_9_1/.project
tags/V20071030_0_9_1/.settings/
tags/V20071030_0_9_1/.tomcatplugin
tags/V20071030_0_9_1/LICENSE
tags/V20071030_0_9_1/README
tags/V20071030_0_9_1/build.xml
tags/V20071030_0_9_1/codingconventions.xml
tags/V20071030_0_9_1/connectionpooling.txt
tags/V20071030_0_9_1/dblayer/
tags/V20071030_0_9_1/lib.dev/
tags/V20071030_0_9_1/magicmap.xml
tags/V20071030_0_9_1/magicmapserver.iml
tags/V20071030_0_9_1/postgresql.txt
tags/V20071030_0_9_1/src/
tags/V20071030_0_9_1/web/
Deleted: tags/V20071030_0_9_1/.classpath
===================================================================
--- tags/V20071030_0_9_1/.classpath 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/.classpath 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry output="dblayer/bin" kind="src" path="dblayer/src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/jpox-20041204.032009.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/magicmap-db-layer.jar"/>
- <classpathentry kind="lib" path="lib.dev/jasper-runtime.jar"/>
- <classpathentry kind="lib" path="lib.dev/jsp-api.jar"/>
- <classpathentry kind="lib" path="lib.dev/servlet-api.jar"/>
- <classpathentry kind="output" path="web/WEB-INF/classes"/>
-</classpath>
Deleted: tags/V20071030_0_9_1/.cvsignore
===================================================================
--- tags/V20071030_0_9_1/.cvsignore 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/.cvsignore 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,2 +0,0 @@
-work
-eclipse_plugins
Deleted: tags/V20071030_0_9_1/.project
===================================================================
--- tags/V20071030_0_9_1/.project 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/.project 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>magicmapserver</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>
- <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
- </natures>
-</projectDescription>
Deleted: tags/V20071030_0_9_1/.tomcatplugin
===================================================================
(Binary files differ)
Deleted: tags/V20071030_0_9_1/LICENSE
===================================================================
(Binary files differ)
Deleted: tags/V20071030_0_9_1/README
===================================================================
(Binary files differ)
Deleted: tags/V20071030_0_9_1/build.xml
===================================================================
--- tags/V20071030_0_9_1/build.xml 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/build.xml 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<project name="magicmapserver" default="jar" basedir=".">
-
- <property name="build" value="web/WEB-INF/classes"/>
- <property name="dist" value="dist"/>
- <property name="src" value="src"/>
-
- <property name="jar.name" value="magicmap-server.jar"/>
-
- <path id="build.classpath">
- <fileset dir="web/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="lib.dev">
- <include name="*.jar"/>
- </fileset>
- </path>
-
-
- <target name="prepare" depends="clean">
- <mkdir dir="${build}" />
- <mkdir dir="${dist}" />
- <!-- Call ant task in dblayer, in order to run the jdo enhancer-->
- <ant dir="dblayer" inheritAll="false"/>
- </target>
-
- <target name="clean">
- <delete dir="${build}" />
- <delete dir="${dist}" />
- <ant dir="dblayer" inheritAll="false" target="clean"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac destdir="${build}"
- target="1.5"
- debug="true"
- deprecation="true"
- debuglevel="lines,vars,source"
- fork="true"
- >
- <classpath refid="build.classpath"/>
- <src path="${src}"/>
- </javac>
- </target>
-
- <target name="jar" depends="compile">
- <jar destfile="${dist}/${jar.name}">
- <fileset dir="${build}"/>
- <fileset dir="dblayer/build"/>
- </jar>
- </target>
-
-
-
-</project>
Deleted: tags/V20071030_0_9_1/codingconventions.xml
===================================================================
--- tags/V20071030_0_9_1/codingconventions.xml 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/codingconventions.xml 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="10">
-<profile name="MagicMap Coding Conventions" version="10">
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="52"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="64"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="64"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-</profile>
-</profiles>
Deleted: tags/V20071030_0_9_1/connectionpooling.txt
===================================================================
--- tags/V20071030_0_9_1/connectionpooling.txt 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/connectionpooling.txt 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,20 +0,0 @@
- //System.getProperties().put("cloudscape.system.home", "C:\\temp");
- javax.naming.InitialContext ic = null;
- javax.sql.DataSource ds;
- String resourceName = "java:comp/env/jdbc/pacw";
- try
- {
- ic = new InitialContext();
- ds = (DataSource) ic.lookup(resourceName);
- Connection con = ds.getConnection();
-
- con.close();
-
- }
- catch (javax.naming.NamingException e)
- {
- e.printStackTrace();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
\ No newline at end of file
Deleted: tags/V20071030_0_9_1/magicmap.xml
===================================================================
--- tags/V20071030_0_9_1/magicmap.xml 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/magicmap.xml 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,85 +0,0 @@
-<Context path="/magicmap" reloadable="true" docBase="/home/pacw/magicmap/web" workDir="/home/pacw/magicmap/work" >
-<!-- Extra info begin -->
-<Resource name="jdbc/magicmap"
- auth="Container"
- type="javax.sql.DataSource"/>
-
- <ResourceParams name="jdbc/magicmap">
- <parameter>
- <name>factory</name>
- <value>
- org.apache.commons.dbcp.BasicDataSourceFactory
- </value>
- </parameter>
-
- <!-- Maximum number of dB connections in
- pool. Make sure you configure your mysqld
- max_connections large enough to handle
- all of your db connections. Set to 0 for
- no limit.
- -->
- <parameter>
- <name>maxActive</name>
- <value>20</value>
- </parameter>
-
- <!-- Maximum number of idle dB connections
- to retain in pool. Set to 0 for no limit.
- -->
- <parameter>
- <name>maxIdle</name>
- <value>5</value>
- </parameter>
-
- <!-- Maximum time to wait for a dB
- connection to become available in ms,
- in this example 10 seconds. An Exception
- is thrown if this timeout is exceeded.
- Set to -1 to wait indefinitely.
- -->
- <parameter>
- <name>maxWait</name>
- <value>10000</value>
- </parameter>
-
- <!--
- username and password for dB connections
- -->
- <parameter>
- <name>username</name>
- <value>magicmap</value>
- </parameter>
- <parameter>
- <name>password</name>
- <value>hamilton</value>
- </parameter>
-
- <!-- Class name for JDBC driver -->
- <parameter>
- <name>driverClassName</name>
- <value>
- org.postgresql.Driver
- </value>
- </parameter>
-
- <!--
- The JDBC connection url for connecting to dB.
- -->
- <parameter>
- <name>url</name>
- <value>
- jdbc:postgresql:magicmap
- </value>
- </parameter>
-
- <!-- what to do with connections which are
- not closed and remain open -->
- <parameter>
- <name>removeAbandoned</name>
- <value>false</value>
- </parameter>
-
- </ResourceParams>
-<!-- Extra info end -->
-</Context>
-
Deleted: tags/V20071030_0_9_1/magicmapserver.iml
===================================================================
--- tags/V20071030_0_9_1/magicmapserver.iml 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/magicmapserver.iml 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="false" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <exclude-output />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/dblayer/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://X:/maven/junit/junit/3.8.1/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/jasper-runtime.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/jsp-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/servlet-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/dom4j-1.6.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/forms-1.0.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-collections-3.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/foxtrot.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jaxrpc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/ostermillerutils_1_05_00.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-codec-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/concurrent.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/colt.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/nekohtml.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-logging.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jung-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/saaj.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xmlParserAPIs.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/derby.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/RelativeLayout.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xercesImpl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xml-apis.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/mail.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jaxen-1.1-beta-9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-httpclient-3.0-rc3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jpox-20041204.032009.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/looks-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/log4j-1.2.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/axis.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/wsdl4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-discovery.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
-</module>
-
Deleted: tags/V20071030_0_9_1/postgresql.txt
===================================================================
--- tags/V20071030_0_9_1/postgresql.txt 2007-10-30 13:14:37 UTC (rev 683)
+++ tags/V20071030_0_9_1/postgresql.txt 2007-10-30 13:16:46 UTC (rev 684)
@@ -1,7 +0,0 @@
-#Datenbank anlegen
-su postgres
-createdb --owner=magicmap magicmap --password
-
-#Datenbank droppen
-su postgres
-dropdb magicmap
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-10-26 11:49:07
|
Revision: 682
http://magicmap.svn.sourceforge.net/magicmap/?rev=682&view=rev
Author: anweiss
Date: 2007-10-26 04:48:18 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
build.xml for beta 5
Modified Paths:
--------------
trunk/magicmapclient/build.xml
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-10-25 13:11:26 UTC (rev 681)
+++ trunk/magicmapclient/build.xml 2007-10-26 11:48:18 UTC (rev 682)
@@ -3,7 +3,7 @@
<property name="application" value="magicmap" />
<!-- Version Information -->
<property name="version.number" value="0.9.1" />
- <property name="version.appendix" value="beta 4" />
+ <property name="version.appendix" value="beta 5" />
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-25 13:11:30
|
Revision: 681
http://magicmap.svn.sourceforge.net/magicmap/?rev=681&view=rev
Author: flederohr
Date: 2007-10-25 06:11:26 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
fixed bug no. 1768459 : Alg: Misbehaviour of edge-length-calculation
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-10-25 10:29:38 UTC (rev 680)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-10-25 13:11:26 UTC (rev 681)
@@ -115,10 +115,10 @@
// Kein gemeinsamer Access Point
//if (same.size() == 0) return 1000.0 * calibration;
-// if (same.size() == 1) {
-// if (diff.size() == 0) return 1.0;
-// return 1000.0 * calibration;
-// }
+ if (same.size() == 1) {
+ // if (diff.size() == 0) return 1.0;
+ return 200.0 * calibration;
+ }
// Basteln von Vektoren f\xFCr die Distance-Funktion
Iterator it = same.iterator();
@@ -174,7 +174,7 @@
// TODO: Logarithmische Skalierung
return Math.abs(MeasurementUtils.signalLevelToStrength(seer.getSignalLevelForAccessPoint(ap)))
* calibration;
-// return Math.abs(0.3 * Math.pow(10,(-0.026 * seer.getSignalLevelForAccessPoint(ap)))-0.5);
+ // return Math.abs(0.3 * Math.pow(10,(-0.026 * seer.getSignalLevelForAccessPoint(ap)))-0.5);
} else
//Wir berechnen nur Abst\xE4nde zwischen APs, Clients und Referenzpunkten
return Double.POSITIVE_INFINITY;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-10-25 10:29:38 UTC (rev 680)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-10-25 13:11:26 UTC (rev 681)
@@ -118,20 +118,18 @@
if (clientOrLocation) {
if (d < 0.95) {
-
LayoutSettings.adjustLocationCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
} else if (d > 1.05) {
LayoutSettings.adjustLocationCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
-
}
-
+ log.debug("Calibration Location: " + LayoutSettings.getCalibrationFactorLocation());
} else {
if (d < 0.95) {
LayoutSettings.adjustAccessPointCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
} else if (d > 1.05) {
LayoutSettings.adjustAccessPointCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
-
}
+ log.debug("Calibration AccessPoint: " + LayoutSettings.getCalibrationFactorAccessPoint());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-25 11:03:17
|
Revision: 679
http://magicmap.svn.sourceforge.net/magicmap/?rev=679&view=rev
Author: flederohr
Date: 2007-10-25 03:00:27 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Version to 0.9.1 beta 4
Modified Paths:
--------------
trunk/magicmapclient/.project
trunk/magicmapclient/build.xml
Property Changed:
----------------
trunk/magicmapclient/
Property changes on: trunk/magicmapclient
___________________________________________________________________
Name: svn:ignore
-
build
dist
magicmap
derby.log
src-gen
MagicMap
nightly.launch
bin
magicmap.jar
referenzpunkt.txt
client.txt
MagicMap.launch
settings.ini
build-test
+
build
dist
magicmap
derby.log
src-gen
MagicMap
nightly.launch
bin
magicmap.jar
referenzpunkt.txt
client.txt
MagicMap.launch
settings.ini
build-test
MagicMapsetup.exe
Modified: trunk/magicmapclient/.project
===================================================================
--- trunk/magicmapclient/.project 2007-10-12 15:00:08 UTC (rev 678)
+++ trunk/magicmapclient/.project 2007-10-25 10:00:27 UTC (rev 679)
@@ -11,14 +11,8 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-10-12 15:00:08 UTC (rev 678)
+++ trunk/magicmapclient/build.xml 2007-10-25 10:00:27 UTC (rev 679)
@@ -3,7 +3,7 @@
<property name="application" value="magicmap" />
<!-- Version Information -->
<property name="version.number" value="0.9.1" />
- <property name="version.appendix" value="beta 2" />
+ <property name="version.appendix" value="beta 4" />
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-25 10:30:00
|
Revision: 680
http://magicmap.svn.sourceforge.net/magicmap/?rev=680&view=rev
Author: flederohr
Date: 2007-10-25 03:29:38 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Java 1.5 compatibility
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-25 10:00:27 UTC (rev 679)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-25 10:29:38 UTC (rev 680)
@@ -74,7 +74,7 @@
public static MapInfo showDialog(Frame owner, String[] maps, LoadMapDialogListener listener){
LoadMapDialog d = new LoadMapDialog(owner, maps);
GUIUtils.locateOnScreen(d);
- d.setModalityType(ModalityType.MODELESS);
+ d.setModal(false);
d.setVisible(true);
d.listener = listener;
return d.getMapInfo();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-12 15:00:10
|
Revision: 678
http://magicmap.svn.sourceforge.net/magicmap/?rev=678&view=rev
Author: flederohr
Date: 2007-10-12 08:00:08 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
removed modality of LoadMapDialog due to some errors
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 14:37:25 UTC (rev 677)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 15:00:08 UTC (rev 678)
@@ -74,7 +74,7 @@
public static MapInfo showDialog(Frame owner, String[] maps, LoadMapDialogListener listener){
LoadMapDialog d = new LoadMapDialog(owner, maps);
GUIUtils.locateOnScreen(d);
- d.setModalityType(ModalityType.DOCUMENT_MODAL);
+ d.setModalityType(ModalityType.MODELESS);
d.setVisible(true);
d.listener = listener;
return d.getMapInfo();
@@ -191,45 +191,57 @@
* map to the model.
*/
public void mapReceived(final MapDTO mapDTO){
+ try {
+ // Mit SWING synchronisieren....
+ SwingUtilities.invokeAndWait(new Runnable() {
- // Mit SWING synchronisieren....
- try {
- info = new MapInfo();
- info.height = mapDTO.getImageHeight().intValue();
- info.width = mapDTO.getImageWidth().intValue();
- info.name = mapDTO.getName();
- info.imageURL = mapDTO.getImageURL().toString();
- setCursor(new Cursor(Cursor.WAIT_CURSOR));
- list.setEnabled(false);
- preview.loadImage(info.imageURL);
- if (preview.getImageHeight() > -1) {
- ok.setEnabled(true);
- INodeModel nodeModel = Controller.getInstance().getNodeModel();
- MapNode node = new MapNode(nodeModel);
- node.setName(mapDTO.getName());
- node.setDisplayName(mapDTO.getName());
- node.setMapInfo(mapDTO);
- nodeModel.addNode(node);
- int selectedIndex = list.getSelectedIndex();
- MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
- defectMap.status = 2;
- } else {
- ok.setEnabled(false);
- int selectedIndex = list.getSelectedIndex();
- MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
- defectMap.status = 1;
- list.repaint();
- }
- list.setEnabled(true);
- list.requestFocus();
- setCursor(cursor);
- } catch (MalformedURLException e) {
+ public void run(){
+ try {
+ info = new MapInfo();
+ info.height = mapDTO.getImageHeight().intValue();
+ info.width = mapDTO.getImageWidth().intValue();
+ info.name = mapDTO.getName();
+ info.imageURL = mapDTO.getImageURL().toString();
+ setCursor(new Cursor(Cursor.WAIT_CURSOR));
+ list.setEnabled(false);
+ preview.loadImage(info.imageURL);
+ if (preview.getImageHeight() > -1) {
+ ok.setEnabled(true);
+ INodeModel nodeModel = Controller.getInstance().getNodeModel();
+ MapNode node = new MapNode(nodeModel);
+ node.setName(mapDTO.getName());
+ node.setDisplayName(mapDTO.getName());
+ node.setMapInfo(mapDTO);
+ nodeModel.addNode(node);
+ int selectedIndex = list.getSelectedIndex();
+ MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
+ defectMap.status = 2;
+ } else {
+ ok.setEnabled(false);
+ int selectedIndex = list.getSelectedIndex();
+ MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
+ defectMap.status = 1;
+ list.repaint();
+ }
+ list.setEnabled(true);
+ list.requestFocus();
+ setCursor(cursor);
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ });
+ } catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
- this.setModalityType(ModalityType.DOCUMENT_MODAL);
- this.setVisible(false);
- this.setVisible(true);
+// this.setModalityType(ModalityType.DOCUMENT_MODAL);
+// this.setVisible(false);
+// this.setVisible(true);
}
@@ -247,9 +259,9 @@
public void valueChanged(ListSelectionEvent e){
if (!e.getValueIsAdjusting()) {
String map = ((MapEntry) this.list.getSelectedValue()).name;
- this.setModalityType(ModalityType.MODELESS);
- this.setVisible(false);
- this.setVisible(true);
+// this.setModalityType(ModalityType.MODELESS);
+// this.setVisible(false);
+// this.setVisible(true);
Controller.getInstance().retrieveMap(map, this);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-12 14:37:32
|
Revision: 677
http://magicmap.svn.sourceforge.net/magicmap/?rev=677&view=rev
Author: flederohr
Date: 2007-10-12 07:37:25 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
wait for preview loading
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 14:15:22 UTC (rev 676)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 14:37:25 UTC (rev 677)
@@ -200,7 +200,8 @@
info.name = mapDTO.getName();
info.imageURL = mapDTO.getImageURL().toString();
setCursor(new Cursor(Cursor.WAIT_CURSOR));
- preview.loadImage(LoadMapDialog.this.info.imageURL);
+ list.setEnabled(false);
+ preview.loadImage(info.imageURL);
if (preview.getImageHeight() > -1) {
ok.setEnabled(true);
INodeModel nodeModel = Controller.getInstance().getNodeModel();
@@ -219,7 +220,8 @@
defectMap.status = 1;
list.repaint();
}
-
+ list.setEnabled(true);
+ list.requestFocus();
setCursor(cursor);
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-12 14:15:24
|
Revision: 676
http://magicmap.svn.sourceforge.net/magicmap/?rev=676&view=rev
Author: flederohr
Date: 2007-10-12 07:15:22 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
set modality of LoadMapDialog
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 13:27:07 UTC (rev 675)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-10-12 14:15:22 UTC (rev 676)
@@ -62,7 +62,7 @@
private Cursor cursor;
private JButton ok;
- private DefaultComboBoxModel mapModel;
+ private DefaultComboBoxModel mapModel;
/**
*
@@ -74,13 +74,12 @@
public static MapInfo showDialog(Frame owner, String[] maps, LoadMapDialogListener listener){
LoadMapDialog d = new LoadMapDialog(owner, maps);
GUIUtils.locateOnScreen(d);
- d.setModal(false);
+ d.setModalityType(ModalityType.DOCUMENT_MODAL);
d.setVisible(true);
d.listener = listener;
return d.getMapInfo();
}
-
public LoadMapDialog(Frame owner, String[] maps) {
super(owner, GUIUtils.i18n("loadmap", false));
setSize(500, 500);
@@ -103,10 +102,11 @@
Vector<MapEntry> entries = new Vector<MapEntry>();
- for (String map: maps){
+ for (String map : maps) {
entries.add(new MapEntry(map));
}
- Collections.sort(entries, new Comparator<MapEntry>(){
+ Collections.sort(entries, new Comparator<MapEntry>() {
+
public int compare(MapEntry o1, MapEntry o2){
return o1.name.compareTo(o2.name);
}
@@ -114,20 +114,20 @@
mapModel = new DefaultComboBoxModel(entries);
this.list = new JList(mapModel);
- list.setCellRenderer(new DefaultListCellRenderer(){
+ list.setCellRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList list, Object value, int arg2, boolean arg3, boolean arg4){
Component cellRenderer = super.getListCellRendererComponent(list, value, arg2, arg3, arg4);
- MapEntry entry = (MapEntry)value;
- switch (entry.status){
- case 1:
- setText("<html><strike>"+entry.name + "</strike></html>");
+ MapEntry entry = (MapEntry) value;
+ switch (entry.status) {
+ case 1 :
+ setText("<html><strike>" + entry.name + "</strike></html>");
break;
- case 2:
- setText("<html><b>"+entry.name + "</b></html>");
+ case 2 :
+ setText("<html><b>" + entry.name + "</b></html>");
break;
- default:
+ default :
setText(entry.name);
break;
}
@@ -191,53 +191,44 @@
* map to the model.
*/
public void mapReceived(final MapDTO mapDTO){
+
+ // Mit SWING synchronisieren....
try {
- // Mit SWING synchronisieren....
- SwingUtilities.invokeAndWait(new Runnable() {
+ info = new MapInfo();
+ info.height = mapDTO.getImageHeight().intValue();
+ info.width = mapDTO.getImageWidth().intValue();
+ info.name = mapDTO.getName();
+ info.imageURL = mapDTO.getImageURL().toString();
+ setCursor(new Cursor(Cursor.WAIT_CURSOR));
+ preview.loadImage(LoadMapDialog.this.info.imageURL);
+ if (preview.getImageHeight() > -1) {
+ ok.setEnabled(true);
+ INodeModel nodeModel = Controller.getInstance().getNodeModel();
+ MapNode node = new MapNode(nodeModel);
+ node.setName(mapDTO.getName());
+ node.setDisplayName(mapDTO.getName());
+ node.setMapInfo(mapDTO);
+ nodeModel.addNode(node);
+ int selectedIndex = list.getSelectedIndex();
+ MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
+ defectMap.status = 2;
+ } else {
+ ok.setEnabled(false);
+ int selectedIndex = list.getSelectedIndex();
+ MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
+ defectMap.status = 1;
+ list.repaint();
+ }
- public void run(){
- try {
- LoadMapDialog.this.info = new MapInfo();
- LoadMapDialog.this.info.height = mapDTO.getImageHeight().intValue();
- LoadMapDialog.this.info.width = mapDTO.getImageWidth().intValue();
- LoadMapDialog.this.info.name = mapDTO.getName();
- LoadMapDialog.this.info.imageURL = mapDTO.getImageURL().toString();
- setCursor(new Cursor(Cursor.WAIT_CURSOR));
- LoadMapDialog.this.preview.loadImage(LoadMapDialog.this.info.imageURL);
- if (LoadMapDialog.this.preview.getImageHeight() > -1){
- LoadMapDialog.this.ok.setEnabled(true);
- INodeModel nodeModel = Controller.getInstance().getNodeModel();
- MapNode node = new MapNode(nodeModel);
- node.setName(mapDTO.getName());
- node.setDisplayName(mapDTO.getName());
- node.setMapInfo(mapDTO);
- nodeModel.addNode(node);
- int selectedIndex = list.getSelectedIndex();
- MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
- defectMap.status = 2;
- }
- else{
- LoadMapDialog.this.ok.setEnabled(false);
- int selectedIndex = list.getSelectedIndex();
- MapEntry defectMap = (MapEntry) mapModel.getElementAt(selectedIndex);
- defectMap.status = 1;
- list.repaint();
- }
-
- setCursor(LoadMapDialog.this.cursor);
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- });
- } catch (InterruptedException e) {
+ setCursor(cursor);
+ } catch (MalformedURLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
+ this.setModalityType(ModalityType.DOCUMENT_MODAL);
+ this.setVisible(false);
+ this.setVisible(true);
+
}
/* (non-Javadoc)
@@ -254,15 +245,20 @@
public void valueChanged(ListSelectionEvent e){
if (!e.getValueIsAdjusting()) {
String map = ((MapEntry) this.list.getSelectedValue()).name;
+ this.setModalityType(ModalityType.MODELESS);
+ this.setVisible(false);
+ this.setVisible(true);
Controller.getInstance().retrieveMap(map, this);
}
}
- private static final class MapEntry{
- public MapEntry(String map){
+
+ private static final class MapEntry {
+
+ public MapEntry(String map) {
name = map;
status = 0;
}
public final String name;
- public int status;
+ public int status;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-12 13:27:36
|
Revision: 675
http://magicmap.svn.sourceforge.net/magicmap/?rev=675&view=rev
Author: flederohr
Date: 2007-10-12 06:27:07 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
better handling of map loading
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-08 15:24:07 UTC (rev 674)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-12 13:27:07 UTC (rev 675)
@@ -6,11 +6,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.SocketTimeoutException;
import java.net.URL;
-import java.rmi.UnknownHostException;
import java.util.ArrayList;
-import java.util.Collection;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIUtils;
@@ -29,7 +26,6 @@
import net.sf.magicmap.client.measurement.interfaces.AbstractScanner;
import net.sf.magicmap.client.measurement.interfaces.AbstractScannerHandler;
import net.sf.magicmap.client.meta.MapInfo;
-import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
@@ -234,10 +230,12 @@
this.client.getMeasurementModel().clear();
this.client.setPosition(0, 0, 0);
this.client.setFix(false);
- this.nodeModel.clear();
-
+ for (Node node : new ArrayList<Node>(nodeModel.getNodes())) {
+ if (node instanceof MapNode) continue;
+ nodeModel.removeNode(node);
+ }
// TODO: move this to right click menu
- this.retrieveMapNames(this, false);
+ // this.retrieveMapNames(this, false);
}
/**
@@ -530,15 +528,13 @@
URL imageURL = new URL(mapDTO.getImageURL());
// check if map image is accessible
imageURL.openStream();
-
+
INodeModel nodeModel = Controller.getInstance().getNodeModel();
MapNode node = new MapNode(nodeModel);
node.setName(mapDTO.getName());
node.setDisplayName(mapDTO.getName());
node.setMapInfo(mapDTO);
nodeModel.addNode(node);
- } catch (MalformedURLException e) {
- } catch (IOException e) {
- }
+ } catch (MalformedURLException e) {} catch (IOException e) {}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-08 15:24:12
|
Revision: 674
http://magicmap.svn.sourceforge.net/magicmap/?rev=674&view=rev
Author: flederohr
Date: 2007-10-08 08:24:07 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
version to 0.9.1 beta 2
Modified Paths:
--------------
trunk/magicmapclient/build.xml
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-10-08 15:00:54 UTC (rev 673)
+++ trunk/magicmapclient/build.xml 2007-10-08 15:24:07 UTC (rev 674)
@@ -3,7 +3,7 @@
<property name="application" value="magicmap" />
<!-- Version Information -->
<property name="version.number" value="0.9.1" />
- <property name="version.appendix" value="beta" />
+ <property name="version.appendix" value="beta 2" />
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-08 15:00:55
|
Revision: 673
http://magicmap.svn.sourceforge.net/magicmap/?rev=673&view=rev
Author: flederohr
Date: 2007-10-08 08:00:54 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
svn:ignore updated
Property Changed:
----------------
trunk/magicmapclient/plugins/
Property changes on: trunk/magicmapclient/plugins
___________________________________________________________________
Name: svn:ignore
- wifiscannerplugin-1.0.jar
+ wifiscannerplugin-1.0.jar
*.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-08 14:58:25
|
Revision: 672
http://magicmap.svn.sourceforge.net/magicmap/?rev=672&view=rev
Author: flederohr
Date: 2007-10-08 07:58:23 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Handle maploading:
double left-click on MapNodes in OutlineView opens Map
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/OutlineView.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapNamesCallback.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-08 12:17:52 UTC (rev 671)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-08 14:58:23 UTC (rev 672)
@@ -4,8 +4,10 @@
package net.sf.magicmap.client.controller;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
+import java.net.URL;
import java.rmi.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,10 +33,12 @@
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
+import net.sf.magicmap.client.model.node.MapNode;
import net.sf.magicmap.client.model.node.Node;
import net.sf.magicmap.client.model.node.NodeModel;
import net.sf.magicmap.client.plugin.PluginManager;
import net.sf.magicmap.client.utils.Settings;
+import net.sf.magicmap.server.dto.MapDTO;
import net.sf.magicmap.server.exception.SessionException;
import org.apache.log4j.xml.DOMConfigurator;
@@ -51,7 +55,8 @@
ServerDisconnectCallback,
ServerConnectCallback,
CreateNewMapCallback,
- MapNamesCallback {
+ MapNamesCallback,
+ MapCallback {
private static int numCalled = 0;
private static int disconnectAttempts = 0;
@@ -170,6 +175,9 @@
closeMap();
}
if (isMapLoaded() && isConnected()) {
+ // TODO: Interface f\xFCr GUI mit methode setMapTitle()
+ ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
+ + currentMap.name);
this.serverManager.resetTimestamp();
this.poller.start();
// initializeScanner(); // Scanner neu initialisieren
@@ -179,6 +187,7 @@
if (this.currentMap.realheight > 0 && this.currentMap.realwidth > 0)
// TODO: Interface f\xFCr GUI mit methode setMapTitle()
+
((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
+ this.currentMap.name + " Gr\xF6\xDFe: " + this.currentMap.realwidth + " X "
+ this.currentMap.realheight + " cm");
@@ -226,6 +235,9 @@
this.client.setPosition(0, 0, 0);
this.client.setFix(false);
this.nodeModel.clear();
+
+ // TODO: move this to right click menu
+ this.retrieveMapNames(this, false);
}
/**
@@ -419,8 +431,6 @@
*/
public void retrieveMap(String name, MapCallback callback){
this.serverManager.retrieveMap(name, callback);
- // TODO: Interface f\xFCr GUI mit methode setMapTitle()
- ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - " + name);
}
public void retrieveMapNames(MapNamesCallback callback, boolean openMapDialog){
@@ -444,11 +454,11 @@
public void addScannerHandler(AbstractScannerHandler handler){
this.scannerAllocator.addScanResultHandler(handler);
}
-
+
public void removeScannerHandler(AbstractScannerHandler handler){
this.scannerAllocator.removeScanResultHandler(handler);
}
-
+
public void initializePlugins(){
try {
this.pluginManager = new PluginManager(new Settings(), this);
@@ -503,4 +513,32 @@
public void openMapDialog(String[] names){
MainGUI.getInstance().getMainFrame().openMapDialog(names);
}
+
+ public void retrievedMapNames(final String[] names){
+ for (String string : names) {
+ retrieveMap(string, this);
+ }
+ }
+
+ public void getMapError(Exception e){
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mapReceived(MapDTO mapDTO){
+ try {
+ URL imageURL = new URL(mapDTO.getImageURL());
+ // check if map image is accessible
+ imageURL.openStream();
+
+ INodeModel nodeModel = Controller.getInstance().getNodeModel();
+ MapNode node = new MapNode(nodeModel);
+ node.setName(mapDTO.getName());
+ node.setDisplayName(mapDTO.getName());
+ node.setMapInfo(mapDTO);
+ nodeModel.addNode(node);
+ } catch (MalformedURLException e) {
+ } catch (IOException e) {
+ }
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-10-08 12:17:52 UTC (rev 671)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-10-08 14:58:23 UTC (rev 672)
@@ -183,8 +183,11 @@
if (!isConnected()) return;
try {
String[] names = SOAPServerManager.this.mapDelegate.getMapNames();
- if (openDialog)
+ if (openDialog) {
callback.openMapDialog(names);
+ } else {
+ callback.retrievedMapNames(names);
+ }
} catch (Exception e) {
e.printStackTrace();
callback.getMapNamesError(e);
@@ -324,8 +327,6 @@
}
}
-
-
/**
* Entfernt einen Referenzpunkt oder die Positionierung eines AccessPoints
* oder Clients mit gegebener Id vom Server
@@ -739,5 +740,4 @@
}
}
-
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-10-08 12:17:52 UTC (rev 671)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-10-08 14:58:23 UTC (rev 672)
@@ -1,6 +1,5 @@
/*
* Created on 10.05.2005
- *
*/
package net.sf.magicmap.client.controller;
@@ -184,6 +183,8 @@
if (openDialog) {
callback.openMapDialog(names);
+ } else {
+ callback.retrievedMapNames(names);
}
} catch (Exception e) {
e.printStackTrace();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/OutlineView.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/OutlineView.java 2007-10-08 12:17:52 UTC (rev 671)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/OutlineView.java 2007-10-08 14:58:23 UTC (rev 672)
@@ -6,6 +6,8 @@
import java.awt.Dimension;
import java.awt.Insets;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
import javax.swing.JComponent;
import javax.swing.JPanel;
@@ -16,6 +18,7 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
+import net.sf.magicmap.client.controller.Controller;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIConstants;
@@ -23,6 +26,7 @@
import net.sf.magicmap.client.gui.utils.RelativePanelBuilder;
import net.sf.magicmap.client.model.node.INodeModel;
import net.sf.magicmap.client.model.node.INodeModelSelectionListener;
+import net.sf.magicmap.client.model.node.MapNode;
import net.sf.magicmap.client.model.node.Node;
import net.sf.magicmap.client.model.node.NodeModelConstants;
import net.sf.magicmap.client.model.node.NodeModelSelectionEvent;
@@ -36,7 +40,7 @@
*
* @author thuebner
*/
-public class OutlineView extends View implements TreeSelectionListener, INodeModelSelectionListener {
+public class OutlineView extends View implements TreeSelectionListener, INodeModelSelectionListener, MouseListener {
/**
* serial version id
@@ -74,6 +78,8 @@
tree.addTreeSelectionListener(this);
+ tree.addMouseListener(this);
+
JComponent pane = new JScrollPane(tree, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
pane.setBorder(new EmptyBorder(new Insets(0, 0, 0, 0)));
@@ -249,4 +255,45 @@
public OutlineModel getOutlineModel(){
return this.outlineModel;
}
+
+ public void mouseClicked(MouseEvent e){
+
+ switch (e.getButton()) {
+ case MouseEvent.BUTTON1 :
+ if (e.getClickCount() == 2) {
+ Node node;
+ // check if MapNode is selected
+ if ((node = ((OutlineTreeNode) ((OutlineTree) e.getSource()).getSelectionPath()
+ .getLastPathComponent()).getNode()) instanceof MapNode)
+ Controller.getInstance().setCurrentMap(((MapNode) node).getMapInfo());
+ }
+ break;
+ case MouseEvent.BUTTON2 :
+ break;
+ case MouseEvent.BUTTON3 :
+ // TODO: right-click-menu
+ break;
+ }
+
+ }
+
+ public void mouseEntered(MouseEvent e){
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseExited(MouseEvent e){
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mousePressed(MouseEvent e){
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseReleased(MouseEvent e){
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapNamesCallback.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapNamesCallback.java 2007-10-08 12:17:52 UTC (rev 671)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapNamesCallback.java 2007-10-08 14:58:23 UTC (rev 672)
@@ -15,6 +15,12 @@
* @param names - the names of the maps
*/
public void openMapDialog(String[] names);
+
+ /**
+ * Get the retrieved map names
+ * @param names - the names of the maps
+ */
+ public void retrievedMapNames(String[] names);
/**
* Get the error msg of the failed map names retrievement
@@ -22,4 +28,5 @@
*/
public void getMapNamesError(Exception e);
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-08 12:18:18
|
Revision: 671
http://magicmap.svn.sourceforge.net/magicmap/?rev=671&view=rev
Author: flederohr
Date: 2007-10-08 05:17:52 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
fix plugin loading problem in Vista
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java 2007-10-02 16:52:38 UTC (rev 670)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java 2007-10-08 12:17:52 UTC (rev 671)
@@ -19,13 +19,19 @@
import java.util.ArrayList;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import net.sf.magicmap.client.net.NetworkInfo;
+import net.sf.magicmap.client.plugin.PluginLoader;
/**
* @author Martin
*/
public class Settings {
+ private static final Log log = LogFactory.getLog(Settings.class);
+
private static Properties settingsProperties;
private static final String settingsFileName = "settings.ini";
private static final String SERVERNAMES_KEY = "servernames";
@@ -361,11 +367,8 @@
public String[] getPluginPaths(){
String defaultPath = "";
- try {
- defaultPath = new File("./plugins/").toURL().toString();
- } catch (MalformedURLException e) {
-
- }
+ defaultPath = new File("plugins/").toURI().toString();
+ Settings.log.debug("Default Plugin Path: " + defaultPath);
String[] paths = Settings.settingsProperties.getProperty("plugin.path", defaultPath).split(",");
return paths;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-02 16:52:41
|
Revision: 670
http://magicmap.svn.sourceforge.net/magicmap/?rev=670&view=rev
Author: flederohr
Date: 2007-10-02 09:52:38 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/magicmapclient/build.xml
trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/Version.java
Added Paths:
-----------
trunk/magicmapclient/plugins/udpscanner-1.0.jar
Removed Paths:
-------------
trunk/magicmapclient/plugins/udpplugin-plugin.jar
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-10-02 15:49:35 UTC (rev 669)
+++ trunk/magicmapclient/build.xml 2007-10-02 16:52:38 UTC (rev 670)
@@ -2,7 +2,8 @@
<project name="magicmapclient" default="jar" basedir=".">
<property name="application" value="magicmap" />
<!-- Version Information -->
- <property name="version.number" value="0.9.0" />
+ <property name="version.number" value="0.9.1" />
+ <property name="version.appendix" value="beta" />
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
@@ -114,6 +115,7 @@
</tstamp>
<propertyfile file="res/version.properties">
<entry key="version" value="${version.number}" />
+ <entry key="appendix" value="${version.appendix}" />
<entry key="buildnumber" value="${build.number}" />
</propertyfile>
</target>
Deleted: trunk/magicmapclient/plugins/udpplugin-plugin.jar
===================================================================
--- trunk/magicmapclient/plugins/udpplugin-plugin.jar 2007-10-02 15:49:35 UTC (rev 669)
+++ trunk/magicmapclient/plugins/udpplugin-plugin.jar 2007-10-02 16:52:38 UTC (rev 670)
@@ -1,70 +0,0 @@
-PK
- |
|
From: <an...@us...> - 2007-10-02 15:49:37
|
Revision: 669
http://magicmap.svn.sourceforge.net/magicmap/?rev=669&view=rev
Author: anweiss
Date: 2007-10-02 08:49:35 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
type safety
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-09-06 13:39:40 UTC (rev 668)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-10-02 15:49:35 UTC (rev 669)
@@ -211,7 +211,7 @@
// Alle momentan gesehenen AccessPoints
// merken
- ArrayList seenAps = location.getSeenAccessPoints();
+ ArrayList <AccessPointNode> seenAps = location.getSeenAccessPoints();
for (SimpleScanResultDTO r : sr) {
String mac = r.getMacAP();
// Gibt es ggf. einen AP mit der
@@ -437,7 +437,7 @@
}
public void removeListener(PollHandlerListener listener){
- this.listeners.remove(listener);
+ listeners.remove(listener);
}
private void firePositionCreatedOrUpdatedOrDeleted(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jza...@us...> - 2007-09-06 13:39:45
|
Revision: 668
http://magicmap.svn.sourceforge.net/magicmap/?rev=668&view=rev
Author: jzapotoc
Date: 2007-09-06 06:39:40 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/magicmapclient/perl/magicmap_mac.pl
Modified: trunk/magicmapclient/perl/magicmap_mac.pl
===================================================================
--- trunk/magicmapclient/perl/magicmap_mac.pl 2007-08-01 13:12:34 UTC (rev 667)
+++ trunk/magicmapclient/perl/magicmap_mac.pl 2007-09-06 13:39:40 UTC (rev 668)
@@ -15,8 +15,7 @@
my $send;
my $hisiaddr;
my $hispaddr;
-# my $mac = "00:0d:93:8b:c6:05";
-my $mac = "00:16:cb:04:53:d6";
+my $mac = "00:00:00:00:00:00";
my $d = "[0-9A-Fa-f]";
my $dd = "$d$d";
@@ -69,4 +68,4 @@
}
}
-main();
\ No newline at end of file
+main();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-08-01 13:12:35
|
Revision: 667
http://magicmap.svn.sourceforge.net/magicmap/?rev=667&view=rev
Author: anweiss
Date: 2007-08-01 06:12:34 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
better parsing of mac addresses
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/net/LinuxNetworkInfo.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/LinuxNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/LinuxNetworkInfo.java 2007-08-01 13:10:38 UTC (rev 666)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/LinuxNetworkInfo.java 2007-08-01 13:12:34 UTC (rev 667)
@@ -6,6 +6,8 @@
import java.io.IOException;
import java.text.ParseException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class LinuxNetworkInfo extends NetworkInfo {
@@ -39,9 +41,10 @@
if (containsLocalHost && lastMacAddress != null) return lastMacAddress;
// see if line contains MAC address
- if (line.indexOf("Hardware") == -1 && line.indexOf("HWaddr") == -1) continue;
-
- String macAddressCandidate = line.substring(line.length() - 17).trim();
+ int macaddressPosition;
+ if ((macaddressPosition=line.indexOf("Hardware") + 9) == 8 && (macaddressPosition=line.indexOf("HWaddr")+7) == 6) continue;
+
+ String macAddressCandidate = line.substring(macaddressPosition).trim();
if (isMacAddress(macAddressCandidate)) {
lastMacAddress = macAddressCandidate;
continue;
@@ -84,8 +87,10 @@
return "";
}
- private final boolean isMacAddress(String macAddressCandidate){
- if (macAddressCandidate.length() != 17) return false;
- return true;
+ private static boolean isMacAddress(String macAddressCandidate){
+ Pattern macPattern = Pattern
+ .compile("[0-9a-fA-F]{2}[-: ]{1}[0-9a-fA-F]{2}[-: ]{1}[0-9a-fA-F]{2}[-: ]{1}[0-9a-fA-F]{2}[-: ]{1}[0-9a-fA-F]{2}[-: ]{1}[0-9a-fA-F]{2}");
+ Matcher m = macPattern.matcher(macAddressCandidate);
+ return m.matches();
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-08-01 13:11:01
|
Revision: 666
http://magicmap.svn.sourceforge.net/magicmap/?rev=666&view=rev
Author: anweiss
Date: 2007-08-01 06:10:38 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
added remove functions
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/ScannerAllocator.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-07-26 14:23:14 UTC (rev 665)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-08-01 13:10:38 UTC (rev 666)
@@ -444,7 +444,11 @@
public void addScannerHandler(AbstractScannerHandler handler){
this.scannerAllocator.addScanResultHandler(handler);
}
-
+
+ public void removeScannerHandler(AbstractScannerHandler handler){
+ this.scannerAllocator.removeScanResultHandler(handler);
+ }
+
public void initializePlugins(){
try {
this.pluginManager = new PluginManager(new Settings(), this);
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/measurement/ScannerAllocator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/measurement/ScannerAllocator.java 2007-07-26 14:23:14 UTC (rev 665)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/measurement/ScannerAllocator.java 2007-08-01 13:10:38 UTC (rev 666)
@@ -24,6 +24,9 @@
public void addScanResultHandler(AbstractScannerHandler handler){
this.handlerMap.put(handler.canHandle(), handler);
}
+ public void removeScanResultHandler(AbstractScannerHandler handler){
+ this.handlerMap.remove(handler.canHandle());
+ }
public AbstractScannerHandler getHandler(AbstractScanner canHandleScanner){
if (this.stopped) return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-07-26 14:23:15
|
Revision: 665
http://magicmap.svn.sourceforge.net/magicmap/?rev=665&view=rev
Author: anweiss
Date: 2007-07-26 07:23:14 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
added iso encoding to build.xml and added wifistumblerplugin to svn.ignore
Modified Paths:
--------------
trunk/magicmapclient/build.xml
Property Changed:
----------------
trunk/magicmapclient/plugins/
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-07-26 14:17:01 UTC (rev 664)
+++ trunk/magicmapclient/build.xml 2007-07-26 14:23:14 UTC (rev 665)
@@ -94,7 +94,7 @@
</target>
<target name="compile" depends="axis">
- <javac destdir="${build}" target="1.5" debug="true" deprecation="true" debuglevel="lines,vars,source" fork="true">
+ <javac destdir="${build}" target="1.5" debug="true" deprecation="true" debuglevel="lines,vars,source" fork="true" encoding="ISO-8859-1">
<classpath refid="build.classpath" />
<src path="${src}" />
<src path="${src.gen}" />
@@ -102,7 +102,7 @@
</target>
<target name="compile-tests" depends="compile">
- <javac destdir="${build-test}" debug="true" deprecation="true" debuglevel="lines,vars,source" fork="true">
+ <javac destdir="${build-test}" target="1.5" debug="true" deprecation="true" debuglevel="lines,vars,source" fork="true" encoding="ISO-8859-1">
<classpath refid="test.classpath" />
<src path="${test}" />
</javac>
Property changes on: trunk/magicmapclient/plugins
___________________________________________________________________
Name: svn:ignore
+ wifiscannerplugin-1.0.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-07-26 14:17:03
|
Revision: 664
http://magicmap.svn.sourceforge.net/magicmap/?rev=664&view=rev
Author: anweiss
Date: 2007-07-26 07:17:01 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
added menus for bugs and forum under "help"
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-07-26 12:01:20 UTC (rev 663)
+++ trunk/magicmapclient/res/screentext.properties 2007-07-26 14:17:01 UTC (rev 664)
@@ -10,6 +10,8 @@
onlinehelp=Online help
onlinehelptooltip=Help at MagicMap wiki
homepage=Homepage
+forum=Forum
+submitBug=Submit bug...
simpleview=Beginner
normalview=Advanced
expertview=Expert
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-07-26 12:01:20 UTC (rev 663)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-07-26 14:17:01 UTC (rev 664)
@@ -10,6 +10,8 @@
onlinehelp=Online Hilfe
onlinehelptooltip=Hilfe im MagicMap Wiki
homepage=Homepage
+forum=Forum
+submitBug=Bug melden...
simpleview=Anf\xE4nger
normalview=Fortgeschritten
expertview=Experte
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-07-26 12:01:20 UTC (rev 663)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-07-26 14:17:01 UTC (rev 664)
@@ -76,6 +76,8 @@
private AbstractAction aboutAction;
private AbstractAction onlineHelp;
private AbstractAction homepageAction;
+ private AbstractAction forumAction;
+ private AbstractAction bugAction;
private MagicAction invisibleAction;
private MagicAction simpleView;
private MagicAction normalView;
@@ -263,9 +265,12 @@
public JMenu buildHelpMenu(){
Browser.init();
JMenu menu = GUIBuilder.createMenu("help");
- menu.add(GUIBuilder.createMenuItem(this.onlineHelp));
menu.add(GUIBuilder.createMenuItem(this.homepageAction));
menu.addSeparator();
+ menu.add(GUIBuilder.createMenuItem(this.onlineHelp));
+ menu.add(GUIBuilder.createMenuItem(this.forumAction));
+ menu.add(GUIBuilder.createMenuItem(this.bugAction));
+ menu.addSeparator();
menu.add(GUIBuilder.createMenuItem(this.aboutAction));
return menu;
}
@@ -605,7 +610,45 @@
}
}
};
+ this.forumAction = new MagicAction("forum") {
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -2931521125912428814L;
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ try {
+ Browser.displayURL("http://sourceforge.net/forum/?group_id=127844");
+ } catch (IOException e1) {
+ //TODO: exception handling
+ }
+ }
+ };
+ this.bugAction = new MagicAction("submitBug") {
+
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -2931521125912428814L;
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ try {
+ Browser.displayURL("http://sourceforge.net/tracker/?atid=711047&group_id=127844&func=browse");
+ } catch (IOException e1) {
+ //TODO: exception handling
+ }
+ }
+ };
+
this.aboutAction = new MagicAction("about") {
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-07-26 12:01:43
|
Revision: 663
http://magicmap.svn.sourceforge.net/magicmap/?rev=663&view=rev
Author: flederohr
Date: 2007-07-26 05:01:20 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
fixed matching
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-19 14:59:59 UTC (rev 662)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-26 12:01:20 UTC (rev 663)
@@ -35,7 +35,7 @@
// see if line contains IP address, this means stop if we've already
// seen a MAC address
// the "(" occurs in vista, if this is a preferred connection
- if ((line.contains(localHost + "/r/n")||line.contains(localHost + "(")) && lastMacAddress != null) return lastMacAddress;
+ if ((line.trim().endsWith(localHost)||line.contains(localHost + "(")) && lastMacAddress != null) return lastMacAddress;
// see if line might contain a MAC address
int macAddressPosition = line.indexOf(":");
if (macAddressPosition <= 0) continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-07-19 15:00:04
|
Revision: 662
http://svn.sourceforge.net/magicmap/?rev=662&view=rev
Author: anweiss
Date: 2007-07-19 07:59:59 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
added "Homepage" Menu
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/res/screentext.properties 2007-07-19 14:59:59 UTC (rev 662)
@@ -9,6 +9,7 @@
help=&Help
onlinehelp=Online help
onlinehelptooltip=Help at MagicMap wiki
+homepage=Homepage
simpleview=Beginner
normalview=Advanced
expertview=Expert
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-07-19 14:59:59 UTC (rev 662)
@@ -9,6 +9,7 @@
help=&Hilfe
onlinehelp=Online Hilfe
onlinehelptooltip=Hilfe im MagicMap Wiki
+homepage=Homepage
simpleview=Anf\xE4nger
normalview=Fortgeschritten
expertview=Experte
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-07-19 14:59:59 UTC (rev 662)
@@ -10,7 +10,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.rmi.RemoteException;
-import java.rmi.UnknownHostException;
import javax.swing.AbstractAction;
import javax.swing.JButton;
@@ -37,11 +36,7 @@
import net.sf.magicmap.client.gui.views.MapView;
import net.sf.magicmap.client.gui.views.MeasurementView;
import net.sf.magicmap.client.gui.views.OutlineView;
-import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
import net.sf.magicmap.client.interfaces.LoadMapDialogListener;
-import net.sf.magicmap.client.interfaces.MapNamesCallback;
-import net.sf.magicmap.client.interfaces.ServerConnectCallback;
-import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.meta.ServerConnectionInfo;
import net.sf.magicmap.client.utils.Settings;
@@ -80,6 +75,7 @@
private AbstractAction exitAction;
private AbstractAction aboutAction;
private AbstractAction onlineHelp;
+ private AbstractAction homepageAction;
private MagicAction invisibleAction;
private MagicAction simpleView;
private MagicAction normalView;
@@ -268,6 +264,7 @@
Browser.init();
JMenu menu = GUIBuilder.createMenu("help");
menu.add(GUIBuilder.createMenuItem(this.onlineHelp));
+ menu.add(GUIBuilder.createMenuItem(this.homepageAction));
menu.addSeparator();
menu.add(GUIBuilder.createMenuItem(this.aboutAction));
return menu;
@@ -588,7 +585,27 @@
}
}
};
+
+ this.homepageAction = new MagicAction("homepage") {
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -2931521125912428814L;
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ try {
+ Browser.displayURL("http://www.magicmap.de");
+ } catch (IOException e1) {
+ //TODO: exception handling
+ }
+ }
+ };
+
this.aboutAction = new MagicAction("about") {
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-19 14:59:59 UTC (rev 662)
@@ -34,6 +34,7 @@
// see if line contains IP address, this means stop if we've already
// seen a MAC address
+ // the "(" occurs in vista, if this is a preferred connection
if ((line.contains(localHost + "/r/n")||line.contains(localHost + "(")) && lastMacAddress != null) return lastMacAddress;
// see if line might contain a MAC address
int macAddressPosition = line.indexOf(":");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-07-19 12:20:37
|
Revision: 661
http://svn.sourceforge.net/magicmap/?rev=661&view=rev
Author: anweiss
Date: 2007-07-19 05:19:35 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
support MAC Adresses with 6 or 8 pairs and preferred network IPs in vista
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-07 11:21:20 UTC (rev 660)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java 2007-07-19 12:19:35 UTC (rev 661)
@@ -34,8 +34,7 @@
// see if line contains IP address, this means stop if we've already
// seen a MAC address
- if (line.endsWith(localHost) && lastMacAddress != null) return lastMacAddress;
-
+ if ((line.contains(localHost + "/r/n")||line.contains(localHost + "(")) && lastMacAddress != null) return lastMacAddress;
// see if line might contain a MAC address
int macAddressPosition = line.indexOf(":");
if (macAddressPosition <= 0) continue;
@@ -48,7 +47,7 @@
}
}
- ParseException ex = new ParseException("Cannot read MAC address from [" + ipConfigResponse + "]", 0);
+ ParseException ex = new ParseException("No active connection found or cannot read MAC address from [" + ipConfigResponse + "]", 0);
ex.printStackTrace();
throw ex;
}
@@ -84,11 +83,12 @@
}
}
}
-
+
private static boolean isMacAddress(String macAddressCandidate){
Pattern macPattern = Pattern
- .compile("[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}");
- Matcher m = macPattern.matcher(macAddressCandidate);
+ .compile("([0-9A-F]{2})(([-:][0-9A-F]{2}){5})(([-:][0-9A-F]{2}){2})?");
+ // .compile("[0-9a-fA-F]{2}([-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2}[-:]{1}[0-9a-fA-F]{2})");
+ Matcher m = macPattern.matcher(macAddressCandidate.toUpperCase());
return m.matches();
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jza...@us...> - 2007-07-07 11:21:24
|
Revision: 660
http://svn.sourceforge.net/magicmap/?rev=660&view=rev
Author: jzapotoc
Date: 2007-07-07 04:21:20 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/magicmapclient/perl/magicmap_mac.pl
Added: trunk/magicmapclient/perl/magicmap_mac.pl
===================================================================
--- trunk/magicmapclient/perl/magicmap_mac.pl (rev 0)
+++ trunk/magicmapclient/perl/magicmap_mac.pl 2007-07-07 11:21:20 UTC (rev 660)
@@ -0,0 +1,72 @@
+#!/usr/bin/perl -w
+# by Maximilian Reiss
+
+use Socket;
+use Sys::Hostname;
+
+my $airport = "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Resources/airport -s";
+
+my $host = "localhost";
+my $port = "2446";
+my $BSSID = "";
+my $Signal = "";
+my $hostname = hostname();
+my $proto = getprotobyname('udp');
+my $send;
+my $hisiaddr;
+my $hispaddr;
+# my $mac = "00:0d:93:8b:c6:05";
+my $mac = "00:16:cb:04:53:d6";
+my $d = "[0-9A-Fa-f]";
+my $dd = "$d$d";
+
+sub sendUDP($) {
+ $send = $_[0];
+ print "Sending udp packet $send\n";
+ socket(SOCKET, PF_INET, SOCK_DGRAM, $proto) || exit;
+ $hisiaddr = inet_aton($host) || exit;
+ $hispaddr = sockaddr_in($port, $hisiaddr);
+ defined(send(SOCKET, $send, 0, $hispaddr)) || exit;
+}
+
+
+sub main() {
+ #print "Hostname : $hostname\n";
+ while (1==1) {
+ open(TEST,"$airport |");
+ my $count = 0;
+ my $counter = 0;
+ ($Second, $minute, $hour, $dayOfMonth, $month, $yearOffset) = localtime();
+ $year = 1900 + $yearOffset;
+ $theTime = "$dayOfMonth.$month.$year $hour:$minute:$Second";
+ print "Time:$theTime ";
+ while ($Zeile = <TEST>) {
+ if ($count > 1) {
+ my @dummy = split(" ",$Zeile);
+ my $dummyLength = @dummy;
+ my $macEntry;
+ for (my $i = 1; $i < $dummyLength; $i++) {
+ if ($dummy[$i] =~ /($dd(:)$dd(\2$dd){4})/o) {
+ $macEntry = $i;
+ }
+ }
+
+ $Signal = $dummy[$macEntry - 4];
+ $BSSID = $dummy[$macEntry];
+
+ #print "Access Point $BSSID has signal level $Signal.\n";
+ $send = "|1*|Unknown*|$BSSID*|$Signal*|100*|$theTime*|$hostname*|$mac*|";
+ sendUDP($send);
+ $counter++;
+ }
+ $count++;
+ }
+ # Round complete
+ $send="|2*|0*|0*|0*|0*|$hostname*|$mac*|";
+ sendUDP($send);
+ print "Anzahl AP: $counter\n\n";
+ sleep 1;
+ }
+}
+
+main();
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-05-30 14:54:41
|
Revision: 659
http://svn.sourceforge.net/magicmap/?rev=659&view=rev
Author: anweiss
Date: 2007-05-30 07:54:26 -0700 (Wed, 30 May 2007)
Log Message:
-----------
added the possibility to add listeners to the pollhandler
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/PollHandlerListener.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-05-30 14:50:55 UTC (rev 658)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-05-30 14:54:26 UTC (rev 659)
@@ -128,6 +128,7 @@
* @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#positionFetchError(java.lang.Exception)
*/
public void positionFetchError(Exception e){
+ this.listener.positionFetchError(e);
e.printStackTrace();
synchronized (ServerPoller.syncObj) {
this.isFetching = false;
@@ -138,6 +139,7 @@
* @see net.sf.magicmap.client.interfaces.FetchGeoPointsCallback#geoPointFetchError(java.lang.Exception)
*/
public void geoPointFetchError(Exception e){
+ this.listener.geoPositionFetchError(e);
e.printStackTrace();
synchronized (ServerPoller.syncObj) {
this.isFetching = false;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java 2007-05-30 14:50:55 UTC (rev 658)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java 2007-05-30 14:54:26 UTC (rev 659)
@@ -136,21 +136,33 @@
}
public static boolean showConnectError(){
- return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("cantconnectretry"), GUIUtils
- .i18n("cantconnect"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null, new String[]{
- GUIUtils.i18n("retry"), GUIUtils.i18n("no")}, GUIUtils.i18n("retry")) == JOptionPane.YES_OPTION;
+ return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("cantconnectretry"),
+ GUIUtils.i18n("cantconnect"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null,
+ new String[]{GUIUtils.i18n("retry"), GUIUtils.i18n("no")}, GUIUtils.i18n("retry")) == JOptionPane.YES_OPTION;
}
+ public static boolean showConnectError(String cause){
+ if (cause == "UnknownHost") {
+ return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(),
+ GUIUtils.i18n("cantconnectretry"), GUIUtils.i18n("cantconnect"), JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.ERROR_MESSAGE, null, new String[]{GUIUtils.i18n("retry"), GUIUtils.i18n("no")},
+ GUIUtils.i18n("retry")) == JOptionPane.YES_OPTION;
+ }
+ else return showConnectionError();
+ }
+
public static boolean showAuthentificationError(String message){
- return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("serverresponse") + "\n" + message,
- GUIUtils.i18n("authentificationerror"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null,
- new String[]{GUIUtils.i18n("retry"), GUIUtils.i18n("no")}, GUIUtils.i18n("retry")) == JOptionPane.YES_OPTION;
+ return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("serverresponse")
+ + "\n" + message, GUIUtils.i18n("authentificationerror"), JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.ERROR_MESSAGE, null, new String[]{GUIUtils.i18n("retry"), GUIUtils.i18n("no")}, GUIUtils
+ .i18n("retry")) == JOptionPane.YES_OPTION;
}
public static boolean showConnectionError(){
- return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("connectionsproblemsreconnect"),
- GUIUtils.i18n("connectionproblems"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null,
- new String[]{GUIUtils.i18n("yes"), GUIUtils.i18n("no")}, GUIUtils.i18n("yes")) == JOptionPane.YES_OPTION;
+ return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils
+ .i18n("connectionsproblemsreconnect"), GUIUtils.i18n("connectionproblems"),
+ JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null, new String[]{GUIUtils.i18n("yes"),
+ GUIUtils.i18n("no")}, GUIUtils.i18n("yes")) == JOptionPane.YES_OPTION;
}
public static void showErrorDialog(String message){
Added: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/PollHandlerListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/PollHandlerListener.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/PollHandlerListener.java 2007-05-30 14:54:26 UTC (rev 659)
@@ -0,0 +1,35 @@
+/*
+ * created on 17.04.2007
+ */
+package net.sf.magicmap.client.interfaces;
+
+
+
+/**
+ * @author Andreas Wei\xDF
+ *
+ */
+public interface PollHandlerListener {
+
+ public void positionCreatedOrUpdatedOrDeleted();
+
+ public void mapCreatedOrUpdatedOrDeleted();
+
+
+ public void geoPosCreatedOrUpdatedOrDeleted();
+
+ /**
+ *
+ * @param e
+ */
+ public void positionFetchError(Exception e);
+
+ /**
+ *
+ * @param e
+ */
+ public void geoPositionFetchError(Exception e);
+
+
+ public void mapCreatedOrUpdatedOrDeletedError(Exception e);
+}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-05-30 14:50:55 UTC (rev 658)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-05-30 14:54:26 UTC (rev 659)
@@ -44,4 +44,16 @@
*/
public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO);
+ /**
+ *
+ * @param e
+ */
+ public void positionFetchError(Exception e);
+
+ /**
+ *
+ * @param e
+ */
+ public void geoPositionFetchError(Exception e);
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
