Changeset 23330 in osm for applications/editors/josm

Timestamp:

2010-09-24T17:34:15+02:00 (14 years ago)

Author:

upliner

Message:

'remember buildings tags'

Location:

applications/editors/josm/plugins/buildings_tools

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (5 diffs)
• build.xml (modified) (1 diff)
• src/buildings_tools/AdvancedSettingsDialog.java (modified) (1 diff)
• src/buildings_tools/ToolSettings.java (modified) (3 diffs)

applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Sat Jun 19 21:24:56 MSD 2010
+#Fri Sep 24 19:30:08 MSD 2010
 eclipse.preferences.version=1
 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_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
@@ -13 +14 @@
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
@@ -57 +59 @@
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
 org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.compact_else_if=true
 org.eclipse.jdt.core.formatter.continuation_indentation=2
 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
@@ -75 +82 @@
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
@@ -255 +263 @@
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

applications/editors/josm/plugins/buildings_tools/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="update to josm latest" />
+        <property name="commit.message" value="remember buildings tags" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3518" />

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java

@@ -60 +60 @@
     public void saveSettings() {
         tagsModel.applyToTags(ToolSettings.getTags());
+        ToolSettings.saveTags();
         ToolSettings.setBBMode(isBBMode());
         ToolSettings.setSoftCursor(isSoftCursor());

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/ToolSettings.java

@@ -1 +1 @@
 package buildings_tools;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
 
 import org.openstreetmap.josm.Main;
@@ -12 +18 @@
     private static final Map<String, String> tags = new HashMap<String, String>();
     private static boolean autoSelect;
-
-    static {
-        tags.put("building", "yes");
-    }
 
     public static void setAddrDialog(boolean _useAddr) {
@@ -39 +41 @@
 
     public static Map<String, String> getTags() {
+        loadTags();
         return tags;
+    }
+
+    public static void saveTags() {
+        ArrayList<String> values = new ArrayList<String>(tags.size() * 2);
+        for (Entry<String, String> entry : tags.entrySet()) {
+            values.add(entry.getKey());
+            values.add(entry.getValue());
+        }
+        Main.pref.putCollection("buildings_tools.tags", values);
+    }
+
+    private static void loadTags() {
+        tags.clear();
+        Collection<String> values = Main.pref.getCollection("buildings_tools.tags",
+                Arrays.asList(new String[] { "building", "yes" }));
+        try {
+            for (Iterator<String> iterator = values.iterator(); iterator.hasNext();) {
+                tags.put(iterator.next(), iterator.next());
+            }
+        } catch (NoSuchElementException e) {
+        }
+
     }