Ticket #20123: 20123-columbusCSV-no-dialog.patch

src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java

@@ -24 +24 @@
         
         ExtensionFileFilter.addImporter(new ColumbusCSVImporter());
     }
-    
-    /**
-     * Called in the preferences dialog to create a preferences page for the plugin,
-     * if any available.
-     */
-    @Override
-    public PreferenceSetting getPreferenceSetting() {
-        if (columbusSettings == null) {
-            columbusSettings = new ColumbusCSVPreferences();
-        }
-        return columbusSettings;
-    } 
 }

src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java

@@ -6 +6 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
 
-import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -14 +12 @@
  * Implements the preferences dialog for this plugin.
  * @author Oliver Wieland <oliver.wieland@online.de>
  */
-public class ColumbusCSVPreferences extends DefaultTabPreferenceSetting {
+public class ColumbusCSVPreferences {
     public static final String PREFIX = "columbuscsv.";
     
     /**
@@ -55 +53 @@
        super();
     }
 
-    /**
-     * Applies the (new) settings after settings dialog has been closed successfully.
-     */
-    @Override
-    public boolean ok() {
-        Config.getPref().putBoolean(SHOW_SUMMARY, colCSVShowSummary.isSelected());
-        Config.getPref().putBoolean(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected());
-        Config.getPref().putBoolean(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected());
-        Config.getPref().putBoolean(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected());
-        Config.getPref().putBoolean(WARN_MISSING_AUDIO, colCSVWarnMissingAudio.isSelected());        
-        return false;
-    }
     
     /**
      * If <tt>true</tt>, a summary dialog is shown after import. Default is <tt>true</tt>.
@@ -112 +98 @@
         return Config.getPref().getBoolean(WARN_MISSING_AUDIO, false);
     }
 
-    /**
-     * 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();
-        gpsWarningsGroup.add(colCSVWarnMissingAudio);
-        gpsWarningsGroup.add(colCSVWarnConversionErrors);
-
-        // Apply settings
-        colCSVShowSummary.setSelected(Config.getPref().getBoolean(SHOW_SUMMARY, true));
-        colCSVDontZoomAfterImport.setSelected(Config.getPref().getBoolean(ZOOM_AFTER_IMPORT, true));
-        colCSVIgnoreVDOP.setSelected(Config.getPref().getBoolean(IGNORE_VDOP, false));
-        colCSVWarnConversionErrors.setSelected(Config.getPref().getBoolean(WARN_CONVERSION_ERRORS, true));
-        colCSVWarnMissingAudio.setSelected(Config.getPref().getBoolean(WARN_MISSING_AUDIO, true));
-    }
-
-    @Override
-    public boolean isExpert() {
-        return false;
-    }
-    
 }