Index: src/org/openstreetmap/josm/data/projection/Mercator.java
===================================================================
--- src/org/openstreetmap/josm/data/projection/Mercator.java (révision 3429)
+++ src/org/openstreetmap/josm/data/projection/Mercator.java (copie de travail)
@@ -21,6 +21,22 @@
*/
public class Mercator implements Projection {
+ /**
+ * Test of the Projection
+ */
+ public static void main(String[] args) {
+ Mercator p = new Mercator();
+
+ {
+ LatLon ll = new LatLon(47 + 3.0 / 60 + 28.95659233 / 3600, 8 + 29.0 / 60 + 11.11127154 / 3600);
+ System.out.println(ll);
+ EastNorth en = p.latlon2eastNorth(ll);
+ System.out.println(en);
+ ll = p.eastNorth2latlon(en);
+ System.out.println(ll);
+ }
+ }
+
public EastNorth latlon2eastNorth(LatLon p) {
return new EastNorth(
p.lon()*Math.PI/180,
Index: src/org/openstreetmap/josm/data/projection/Projection.java
===================================================================
--- src/org/openstreetmap/josm/data/projection/Projection.java (révision 3429)
+++ src/org/openstreetmap/josm/data/projection/Projection.java (copie de travail)
@@ -18,6 +18,7 @@
public static Projection[] allProjections = new Projection[]{
new Epsg4326(),
new Mercator(),
+ new GoogleMercator(),
new LambertEST(), // Still needs proper default zoom
new Lambert(), // Still needs proper default zoom
new Puwg(),
Index: src/org/openstreetmap/josm/data/projection/SwissGrid.java
===================================================================
--- src/org/openstreetmap/josm/data/projection/SwissGrid.java (révision 3429)
+++ src/org/openstreetmap/josm/data/projection/SwissGrid.java (copie de travail)
@@ -8,83 +8,162 @@
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.CoordinateFormat;
+
/**
* Projection for the SwissGrid, see http://de.wikipedia.org/wiki/Swiss_Grid.
*
* Calculations are based on formula from
* http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.12749.DownloadFile.tmp/ch1903wgs84en.pdf
*
+ * August 2010 update to this formula (rigorous formulas)
+ * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.97912.DownloadFile.tmp/swissprojectionen.pdf
*/
public class SwissGrid implements Projection {
+
+ public static void main(String[] args) {
+ LatLon ll = new LatLon(46.9524056, 7.4395833);
+ System.out.println(ll);
+ ll = new SwissGrid().correctCH1903toETRS89(ll);
+ System.out.println(ll);
+ System.out.println(ll.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
+ System.out.println(ll.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
+ System.out.println(ll.lat()*3600);
+ System.out.println(ll.lon()*3600);
+ }
+
+ private static final double dX = 674.374;
+ private static final double dY = 15.056;
+ private static final double dZ = 405.346;
+
+ private static final double wgs84_a = 6378137.000;
+ private static final double wgs84_b = 6356752.314245;
+// private static final double wgs84_f = (wgs84_a-wgs84_b)/wgs84_a;
+ private static final double wgs84_E2 = (Math.pow(wgs84_a, 2)-Math.pow(wgs84_b, 2))/Math.pow(wgs84_a, 2);
+// private static final double wgs84_E = Math.sqrt(wgs84_E2);
+
+
+ private static final double a = 6377397.155;
+ private static final double b = 6356078.962822;
+// private static final double f = (a-b)/a;
+ private static final double E2 = (Math.pow(a, 2)-Math.pow(b, 2))/Math.pow(a, 2);
+ private static final double E = Math.sqrt(E2);
+ private static final double phi0 = Math.toRadians(46.0 + 57.0 / 60 + 8.66 / 3600);
+ private static final double lambda0 = Math.toRadians(7.0 + 26.0 / 60 + 22.50 / 3600);
+ private static final double R = a * Math.sqrt(1 - E2) / (1 - (E2 * Math.pow(Math.sin(phi0), 2)));
+ private static final double alpha = Math.sqrt(1 + (E2 / (1 - E2) * Math.pow(Math.cos(phi0), 4)));
+ private static final double b0 = Math.asin(Math.sin(phi0) / alpha);
+ private static final double K = Math.log(Math.tan(Math.PI / 4 + b0 / 2)) - alpha
+ * Math.log(Math.tan(Math.PI / 4 + phi0 / 2)) + alpha * E / 2
+ * Math.log((1 + E * Math.sin(phi0)) / (1 - E * Math.sin(phi0)));
+
+ private static final double xTrans = 200000;
+ private static final double yTrans = 600000;
+
+ private LatLon correctETRS89toCH1903(LatLon coord) {
+ double phi = Math.toRadians(coord.lat());
+ double lambda = Math.toRadians(coord.lon());
+
+ double Rn = wgs84_a/Math.sqrt(1-wgs84_E2*Math.pow(Math.sin(phi), 2));
+ double X = Rn*Math.cos(phi)*Math.cos(lambda);
+ double Y = Rn*Math.cos(phi)*Math.sin(lambda);
+ double Z = Rn*(1-wgs84_E2)*Math.sin(phi);
+ X -= dX;
+ Y -= dY;
+ Z -= dZ;
+ lambda = Math.atan2(Y,X);
+ double sX2Ys = Math.sqrt(X*X+Y*Y);
+ phi = Math.atan2(Z,sX2Ys);
+ double h = 0;
+
+ for (int i = 0 ; i < 6 ; i++) {
+ Rn = a/Math.sqrt(1-E2*Math.pow(Math.sin(phi), 2));
+ h = sX2Ys/Math.cos(phi)-Rn;
+ phi = Math.atan2(Z/sX2Ys,1-Rn*E2/(Rn+h));
+ }
+
+ return new LatLon(Math.toDegrees(phi), Math.toDegrees(lambda));
+ }
+
+ private LatLon correctCH1903toETRS89(LatLon coord) {
+ double phi = Math.toRadians(coord.lat());
+ double lambda = Math.toRadians(coord.lon());
+
+ double Rn = a/Math.sqrt(1-E2*Math.pow(Math.sin(phi), 2));
+ double X = Rn*Math.cos(phi)*Math.cos(lambda);
+ double Y = Rn*Math.cos(phi)*Math.sin(lambda);
+ double Z = Rn*(1-E2)*Math.sin(phi);
+ X += dX;
+ Y += dY;
+ Z += dZ;
+ lambda = Math.atan2(Y,X);
+ double sX2Ys = Math.sqrt(X*X+Y*Y);
+ phi = Math.atan((Z/sX2Ys));
+ double h = 0;
+
+ for (int i = 0 ; i < 5 ; i++) {
+ Rn = wgs84_a/Math.sqrt(1-wgs84_E2*Math.pow(Math.sin(phi), 2));
+ h = sX2Ys/Math.cos(phi)-Rn;
+ phi = Math.atan2(Z/sX2Ys,1-Rn*wgs84_E2/(Rn+h));
+ }
+
+ return new LatLon(Math.toDegrees(phi), Math.toDegrees(lambda));
+ }
+
/**
* @param wgs WGS84 lat/lon (ellipsoid GRS80) (in degree)
* @return eastnorth projection in Swiss National Grid (ellipsoid Bessel)
*/
public EastNorth latlon2eastNorth(LatLon wgs) {
- double phi = 3600d * wgs.lat();
- double lambda = 3600d * wgs.lon();
+ LatLon coord = correctETRS89toCH1903(wgs);
+ double phi = Math.toRadians(coord.lat());
+ double lambda = Math.toRadians(coord.lon());
- double phiprime = (phi - 169028.66d) / 10000d;
- double lambdaprime = (lambda - 26782.5d) / 10000d;
+ double S = alpha * Math.log(Math.tan(Math.PI / 4 + phi / 2)) - alpha * E / 2
+ * Math.log((1 + E * Math.sin(phi)) / (1 - E * Math.sin(phi))) + K;
+ double b = 2 * (Math.atan(Math.exp(S)) - Math.PI / 4);
+ double l = alpha * (lambda - lambda0);
- // precompute squares for lambdaprime and phiprime
- //
- double lambdaprime_2 = Math.pow(lambdaprime,2);
- double phiprime_2 = Math.pow(phiprime,2);
+ double lb = Math.atan2(Math.sin(l), Math.sin(b0) * Math.tan(b) + Math.cos(b0) * Math.cos(l));
+ double bb = Math.asin(Math.cos(b0) * Math.sin(b) - Math.sin(b0) * Math.cos(b) * Math.cos(l));
- double north =
- 200147.07d
- + 308807.95d * phiprime
- + 3745.25d * lambdaprime_2
- + 76.63d * phiprime_2
- - 194.56d * lambdaprime_2 * phiprime
- + 119.79d * Math.pow(phiprime,3);
+ double y = R * lb;
+ double x = R / 2 * Math.log((1 + Math.sin(bb)) / (1 - Math.sin(bb)));
- double east =
- 600072.37d
- + 211455.93d * lambdaprime
- - 10938.51d * lambdaprime * phiprime
- - 0.36d * lambdaprime * phiprime_2
- - 44.54d * Math.pow(lambdaprime,3);
-
- return new EastNorth(east, north);
+ return new EastNorth(y + yTrans, x + xTrans);
}
/**
* @param xy SwissGrid east/north (in meters)
* @return LatLon WGS84 (in degree)
*/
-
public LatLon eastNorth2latlon(EastNorth xy) {
- double yp = (xy.east() - 600000d) / 1000000d;
- double xp = (xy.north() - 200000d) / 1000000d;
+ double x = xy.north() - xTrans;
+ double y = xy.east() - yTrans;
- // precompute squares of xp and yp
- //
- double xp_2 = Math.pow(xp,2);
- double yp_2 = Math.pow(yp,2);
+ double lb = y / R;
+ double bb = 2 * (Math.atan(Math.exp(x / R)) - Math.PI / 4);
- // lambda = latitude, phi = longitude
- double lmbp = 2.6779094d
- + 4.728982d * yp
- + 0.791484d * yp * xp
- + 0.1306d * yp * xp_2
- - 0.0436d * Math.pow(yp,3);
+ double b = Math.asin(Math.cos(b0) * Math.sin(bb) + Math.sin(b0) * Math.cos(bb) * Math.cos(lb));
+ double l = Math.atan2(Math.sin(lb), Math.cos(b0) * Math.cos(lb) - Math.sin(b0) * Math.tan(bb));
- double phip = 16.9023892d
- + 3.238272d * xp
- - 0.270978d * yp_2
- - 0.002528d * xp_2
- - 0.0447d * yp_2 * xp
- - 0.0140d * Math.pow(xp,3);
+ double lambda = lambda0 + l / alpha;
+ double phi = b;
+ double S = 0;
- double lmb = lmbp * 100.0d / 36.0d;
- double phi = phip * 100.0d / 36.0d;
+ // 5 iteration to fins S and phi
+ for (int i = 0; i < 6; i++) {
+ S = 1 / alpha * (Math.log(Math.tan(Math.PI / 4 + b / 2)) - K) + E
+ * Math.log(Math.tan(Math.PI / 4 + Math.asin(E * Math.sin(phi)) / 2));
+ phi = 2 * Math.atan(Math.exp(S)) - Math.PI / 2;
+ }
- return new LatLon(phi,lmb);
+ LatLon coord = new LatLon(Math.toDegrees(phi), Math.toDegrees(lambda));
+ return correctCH1903toETRS89(coord);
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return tr("Swiss Grid (Switzerland)");
}
@@ -101,11 +180,8 @@
return "swissgrid";
}
- public Bounds getWorldBoundsLatLon()
- {
- return new Bounds(
- new LatLon(45.7, 5.7),
- new LatLon(47.9, 10.6));
+ public Bounds getWorldBoundsLatLon() {
+ return new Bounds(new LatLon(45.7, 5.7), new LatLon(47.9, 10.6));
}
public double getDefaultZoomInPPD() {
Index: .classpath
===================================================================
--- .classpath (révision 3429)
+++ .classpath (copie de travail)
@@ -15,8 +15,8 @@
-
+
Index: .settings/org.eclipse.jdt.core.prefs
===================================================================
--- .settings/org.eclipse.jdt.core.prefs (révision 3429)
+++ .settings/org.eclipse.jdt.core.prefs (copie de travail)
@@ -1,77 +1,15 @@
-#Sun May 23 17:35:27 CEST 2010
+#Fri Aug 13 18:40:22 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -115,11 +53,9 @@
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=false
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
@@ -145,7 +81,6 @@
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
Index: .settings/org.eclipse.jdt.ui.prefs
===================================================================
--- .settings/org.eclipse.jdt.ui.prefs (révision 3429)
+++ .settings/org.eclipse.jdt.ui.prefs (copie de travail)
@@ -1,59 +1,7 @@
-#Wed Jan 27 11:53:40 EST 2010
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_josm
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n */// License\: GPL. \r\n/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Javadoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */// License\: GPL. For details, see LICENSE file.\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n\r\n\r\n\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated function stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=false
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=false
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+#Fri Aug 13 18:09:15 CEST 2010
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_josm
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n */// License\: GPL. \r\n/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Javadoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */// License\: GPL. For details, see LICENSE file.\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n\r\n\r\n\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated function stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};