Index: /applications/editors/josm/plugins/ColumbusCSV/build.xml
===================================================================
--- /applications/editors/josm/plugins/ColumbusCSV/build.xml	(revision 27881)
+++ /applications/editors/josm/plugins/ColumbusCSV/build.xml	(revision 27882)
@@ -93,5 +93,5 @@
                 <attribute name="de_Plugin-Description" value="Importiert die CSV-Dateien des Columbus/Visiontac V-900 GPS Loggers in GPX-Daten."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ColumbusCSV"/>
-                <attribute name="Plugin-Mainversion" value="4595"/>
+                <attribute name="Plugin-Mainversion" value="4980"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Icon" value="images/colcsvicon.png"/>
Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java
===================================================================
--- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java	(revision 27881)
+++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java	(revision 27882)
@@ -16,7 +16,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
@@ -31,135 +28,114 @@
  * @author Oliver Wieland <oliver.wieland@online.de>
  */
-public class ColumbusCSVPreferences implements PreferenceSetting, ItemListener {
-	public static final String PREFIX = "columbuscsv.";
-	
-	/**
-	 * Show summary after import.
-	 */
-	public static final String SHOW_SUMMARY = PREFIX + "import.showSummary";
-	/**
-	 * Disable auto zoom after import.
-	 */
-	public static final String ZOOM_AFTER_IMPORT = PREFIX + "import.dontZoomAfterImport";
-	/** 
-	 * If <tt>true</tt>, all DOP values (hdop, vdop, pdop) are ignored. If the V-900 runs in simple mode,
-	 * this setting has no effect.
-	 */
-	public static final String IGNORE_VDOP = PREFIX + "import.ignoreVDOP";
-	/**
-	 * Issue warning on missing audio files.
-	 */
-	public static final String WARN_MISSING_AUDIO = PREFIX + "warn.missingAudio";
-	/**
-	 * Issue warning on conversion errors.
-	 */
-	public static final String WARN_CONVERSION_ERRORS = PREFIX + "warn.conversionErrors";
-	
-	/**
-	 * Ui elements for each flag.
-	 */
-	private JCheckBox colCSVShowSummary = new JCheckBox(tr("Show summary after import"));
-	private JCheckBox colCSVDontZoomAfterImport = new JCheckBox(tr("Do not zoom after import"));
-	private JCheckBox colCSVIgnoreVDOP = new JCheckBox(tr("Ignore hdop/vdop/pdop entries"));
-	private JCheckBox colCSVWarnMissingAudio = new JCheckBox(tr("Warn on missing audio files"));
-	private JCheckBox colCSVWarnConversionErrors = new JCheckBox(tr("Warn on conversion errors"));
-	
-	/**
-	 * Creates a new preferences instance.
-	 */
-	public ColumbusCSVPreferences() {
-		super();
-	
-	}
+public class ColumbusCSVPreferences implements PreferenceSetting {
+    public static final String PREFIX = "columbuscsv.";
+    
+    /**
+     * Show summary after import.
+     */
+    public static final String SHOW_SUMMARY = PREFIX + "import.showSummary";
+    /**
+     * Disable auto zoom after import.
+     */
+    public static final String ZOOM_AFTER_IMPORT = PREFIX + "import.dontZoomAfterImport";
+    /** 
+     * If <tt>true</tt>, all DOP values (hdop, vdop, pdop) are ignored. If the V-900 runs in simple mode,
+     * this setting has no effect.
+     */
+    public static final String IGNORE_VDOP = PREFIX + "import.ignoreVDOP";
+    /**
+     * Issue warning on missing audio files.
+     */
+    public static final String WARN_MISSING_AUDIO = PREFIX + "warn.missingAudio";
+    /**
+     * Issue warning on conversion errors.
+     */
+    public static final String WARN_CONVERSION_ERRORS = PREFIX + "warn.conversionErrors";
+    
+    /**
+     * Ui elements for each flag.
+     */
+    private JCheckBox colCSVShowSummary = new JCheckBox(tr("Show summary after import"));
+    private JCheckBox colCSVDontZoomAfterImport = new JCheckBox(tr("Do not zoom after import"));
+    private JCheckBox colCSVIgnoreVDOP = new JCheckBox(tr("Ignore hdop/vdop/pdop entries"));
+    private JCheckBox colCSVWarnMissingAudio = new JCheckBox(tr("Warn on missing audio files"));
+    private JCheckBox colCSVWarnConversionErrors = new JCheckBox(tr("Warn on conversion errors"));
+    
+    /**
+     * Creates a new preferences instance.
+     */
+    public ColumbusCSVPreferences() {
+       super();
+    }
 
-	/**
-	 * Applies the (new) settings after settings dialog has been closed successfully.
-	 */
-	public boolean ok() {
-		Main.pref.put(SHOW_SUMMARY, colCSVShowSummary.isSelected());
-		Main.pref.put(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected());
-		Main.pref.put(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected());
-		Main.pref.put(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected());
-		Main.pref.put(WARN_MISSING_AUDIO, colCSVWarnMissingAudio.isSelected());		
-		return false;
-	}
-	
-	/**
-	 * Handles state changes of check buttons
-	 */
-	public void itemStateChanged(ItemEvent itemEv) {
-		/*
-		if (itemEv.getSource() == colCSVShowSummary) {
-			colCSVWarnMissingAudio.setEnabled(colCSVIgnoreAudio.isSelected());
-		}*/
-	}
+    /**
+     * Applies the (new) settings after settings dialog has been closed successfully.
+     */
+    @Override
+    public boolean ok() {
+        Main.pref.put(SHOW_SUMMARY, colCSVShowSummary.isSelected());
+        Main.pref.put(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected());
+        Main.pref.put(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected());
+        Main.pref.put(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected());
+        Main.pref.put(WARN_MISSING_AUDIO, colCSVWarnMissingAudio.isSelected());		
+        return false;
+    }
+    
+    /**
+     * If <tt>true</tt>, a summary dialog is shown after import. Default is <tt>true</tt>.
+     * @return
+     */
+    public static boolean showSummary() {
+	    return Main.pref.getBoolean(SHOW_SUMMARY, true);
+    }
+    
+    /**
+     * If <tt>true</tt>, a the bounding box will not be scaled to the imported data.
+     * @return
+     */
+    public static boolean zoomAfterImport() {
+	    return Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true);
+    }
+    
+    /**
+     * If <tt>true</tt>, all DOP values (hdop, vdop, pdop) are ignored. If the V-900 runs in simple mode,
+     * this setting has no effect. 
+     * Default is <tt>false</tt>.
+     * @return
+     */
+    public static boolean ignoreDOP() {
+        return Main.pref.getBoolean(IGNORE_VDOP, false);
+    }
+    
+    /**
+     * If <tt>true</tt>, the plugin issues warnings if either date or position errors have been occurred. 
+     * Default is <tt>true</tt>.
+     * @return
+     */
+    public static boolean warnConversion() {
+        return Main.pref.getBoolean(WARN_CONVERSION_ERRORS, false);
+    }
+    
+    /**
+     * If <tt>true</tt>, the plugin issues a warning if a referenced audio file is missing. 
+     * Default is <tt>true</tt>.
+     * @return
+     */
+    public static boolean warnMissingAudio() {
+        return Main.pref.getBoolean(WARN_MISSING_AUDIO, false);
+    }
 
-	/**
-	 * If <tt>true</tt>, a summary dialog is shown after import. Default is <tt>true</tt>.
-	 * @return
-	 */
-	public static boolean showSummary() {
-		return Main.pref.getBoolean(SHOW_SUMMARY, true);
-	}
-	
-	/**
-	 * If <tt>true</tt>, a the bounding box will not be scaled to the imported data.
-	 * @return
-	 */
-	public static boolean zoomAfterImport() {
-		return Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true);
-	}
-	
-	/**
-	 * If <tt>true</tt>, all DOP values (hdop, vdop, pdop) are ignored. If the V-900 runs in simple mode,
-	 * this setting has no effect. 
-	 * Default is <tt>false</tt>.
-	 * @return
-	 */
-	public static boolean ignoreDOP() {
-		return Main.pref.getBoolean(IGNORE_VDOP, false);
-	}
-	
-	/**
-	 * If <tt>true</tt>, the plugin issues warnings if either date or position errors have been occurred. 
-	 * Default is <tt>true</tt>.
-	 * @return
-	 */
-	public static boolean warnConversion() {
-		return Main.pref.getBoolean(WARN_CONVERSION_ERRORS, false);
-	}
-	
-	/**
-	 * If <tt>true</tt>, the plugin issues a warning if a referenced audio file is missing. 
-	 * Default is <tt>true</tt>.
-	 * @return
-	 */
-	public static boolean warnMissingAudio() {
-		return Main.pref.getBoolean(WARN_MISSING_AUDIO, false);
-	}
-
-	/**
-	 * Populates the UI with our settings.
-	 * @param gui The dialog to populate.
-	 */
-	public void addGui(PreferenceDialog gui) {
-		addPrefs();
-	}	
-	
-	/**
-	 * Populates the UI with our settings.
-	 * @param gui The pane to populate.
-	 */
-	public void addGui(PreferenceTabbedPane gui) {
-		addPrefs();
-	}
-	
-	private void addPrefs() {
-		// Import settings
+    /**
+     * Populates the UI with our settings.
+     * @param gui The pane to populate.
+     */
+    @Override
+    public void addGui(PreferenceTabbedPane gui) {
+        // Import settings
         ButtonGroup gpsImportGroup = new ButtonGroup();
         gpsImportGroup.add(colCSVShowSummary);
         gpsImportGroup.add(colCSVDontZoomAfterImport);
         gpsImportGroup.add(colCSVIgnoreVDOP);
-        
+      
         // Warning settings
         ButtonGroup gpsWarningsGroup = new ButtonGroup();
@@ -173,5 +149,9 @@
         colCSVWarnConversionErrors.setSelected(Main.pref.getBoolean(WARN_CONVERSION_ERRORS, true));
         colCSVWarnMissingAudio.setSelected(Main.pref.getBoolean(WARN_MISSING_AUDIO, true));
-	}
-			
+    }
+    
+    @Override
+    public boolean isExpert() {
+        return false;
+    }
 }