Index: applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- applications/editors/josm/plugins/terracer/build.xml	(revision 21164)
+++ applications/editors/josm/plugins/terracer/build.xml	(revision 21166)
@@ -32,5 +32,5 @@
 
 
-    <property name="commit.message" value="Update to JOSM core" />
+    <property name="commit.message" value="Remember the interpolation setting between restarts" />
     <property name="plugin.main.version" value="3210" />
 
Index: applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 21164)
+++ applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 21166)
@@ -58,4 +58,5 @@
     final static String HANDLE_RELATION = "plugins.terracer.handle_relation";
     final static String DELETE_OUTLINE = "plugins.terracer.delete_outline";
+    final static String INTERPOLATION = "plugins.terracer.interpolation";
 
     final private Way street;
@@ -163,4 +164,5 @@
             hiLabel.setText(tr("Highest Number"));
             final String txt = relationExists ? tr("add to existing associatedStreet relation") : tr("create an associatedStreet relation");
+
             handleRelationCheckBox = new JCheckBox(txt, Main.pref.getBoolean(HANDLE_RELATION, true));
             deleteOutlineCheckBox = new JCheckBox(tr("delete outline way"), Main.pref.getBoolean(DELETE_OUTLINE, true));
@@ -265,4 +267,10 @@
             interpolation.add(tr("All"));
             interpolation.add(tr("Even/Odd"));
+            if (Main.pref.getInteger(INTERPOLATION, 2) == 1) {
+            	interpolation.select(tr("All"));
+            } else {
+            	interpolation.select(tr("Even/Odd"));
+            }
+            //return (dialog.interpolation.getSelectedItem().equals(tr("All"))) ? 1 : 2;
         }
         return interpolation;
Index: applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 21164)
+++ applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 21166)
@@ -305,5 +305,5 @@
      * @return the stepSize (1 for all, 2 for odd /even)
      */
-    public int stepSize() {
+    public Integer stepSize() {
         return (dialog.interpolation.getSelectedItem().equals(tr("All"))) ? 1
                 : 2;
@@ -387,4 +387,5 @@
     }
 
+   
     /**
      * Whether the user likes to delete the outline way.
@@ -393,5 +394,5 @@
         return dialog.deleteOutlineCheckBox.isSelected();
     }
-
+    
     /* (non-Javadoc)
      * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
@@ -417,4 +418,5 @@
         Main.pref.put(HouseNumberInputDialog.HANDLE_RELATION, doHandleRelation());
         Main.pref.put(HouseNumberInputDialog.DELETE_OUTLINE, doDeleteOutline());
+        Main.pref.put(HouseNumberInputDialog.INTERPOLATION, stepSize().toString());
     }
 }