Changeset 3797 in josm

Timestamp:

2011-01-21T14:11:47+01:00 (13 years ago)

Author:

bastiK

Message:

rename some stuff: StyleSourceEditor is generic editor for both MapPaint styles andd Tagging Presets

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• MapPaintPreference.java (modified) (8 diffs)
• SourceEditor.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java ) (39 diffs)
• TaggingPresetPreference.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.preferences.StyleSourceEditor.StyleSourceInfo;
+import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.tools.GBC;
 
 public class MapPaintPreference implements PreferenceSetting {
-    private StyleSourceEditor sources;
+    private SourceEditor sources;
     private JCheckBox enableIconDefault;
     private JCheckBox enableDefault;
@@ -81 +81 @@
                     public void stateChanged(ChangeEvent e) {
                         if (gui.mapcontent.getSelectedComponent() == panel) {
-                            sources.initiallyLoadAvailableStyles();
+                            sources.initiallyLoadAvailableSources();
                         }
                     }
@@ -88 +88 @@
     }
 
-    class MapPaintSourceEditor extends StyleSourceEditor {
+    class MapPaintSourceEditor extends SourceEditor {
 
         final private String iconpref = "mappaint.icon.sources";
@@ -103 +103 @@
         @Override
         public boolean finish() {
-            List<SourceEntry> activeStyles = activeStylesModel.getStyles();
+            List<SourceEntry> activeStyles = activeSourcesModel.getSources();
 
             boolean changed = (new MapPaintPrefMigration()).put(activeStyles);
@@ -122 +122 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
+        public Collection<ExtendedSourceEntry> getDefault() {
             return (new MapPaintPrefMigration()).getDefault();
         }
@@ -138 +138 @@
                 case ACTIVE_SOURCES:
                     return tr("Active styles:");
+                case NEW_SOURCE_ENTRY_TOOLTIP:
+                     return tr("Add a new style by entering filename or URL");
                 case NEW_SOURCE_ENTRY:
                     return tr("New style entry:");
@@ -194 +196 @@
     }
 
-    public static class MapPaintPrefMigration extends StyleSourceEditor.SourcePrefMigration {
+    public static class MapPaintPrefMigration extends SourceEditor.SourcePrefMigration {
 
         public MapPaintPrefMigration() {
@@ -203 +205 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
-            StyleSourceInfo i = new StyleSourceInfo("elemstyles.xml", "resource://data/elemstyles.xml");
+        public Collection<ExtendedSourceEntry> getDefault() {
+            ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://data/elemstyles.xml");
             i.name = "standard";
             i.shortdescription = tr("Internal Style");

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -79 +79 @@
 import org.xml.sax.SAXException;
 
-public abstract class StyleSourceEditor extends JPanel {
-
-    protected JTable tblActiveStyles;
-    protected ActiveStylesModel activeStylesModel;
-    protected JList lstAvailableStyles;
-    protected AvailableStylesListModel availableStylesModel;
+public abstract class SourceEditor extends JPanel {
+
+    protected JTable tblActiveSources;
+    protected ActiveSourcesModel activeSourcesModel;
+    protected JList lstAvailableSources;
+    protected AvailableSourcesListModel availableSourcesModel;
     protected JTable tblIconPaths = null;
     protected IconPathTableModel iconPathsModel;
-    protected boolean stylesInitiallyLoaded;
-    protected String availableStylesUrl;
+    protected boolean sourcesInitiallyLoaded;
+    protected String availableSourcesUrl;
 
     /**
      * constructor
-     * @param availableStylesUrl the URL to the list of available style sources
+     * @param availableSourcesUrl the URL to the list of available sources
      */
-    public StyleSourceEditor(final String availableStylesUrl) {
+    public SourceEditor(final String availableSourcesUrl) {
 
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
-        lstAvailableStyles = new JList(availableStylesModel = new AvailableStylesListModel(selectionModel));
-        lstAvailableStyles.setSelectionModel(selectionModel);
-        lstAvailableStyles.setCellRenderer(new StyleSourceCellRenderer());
-        this.availableStylesUrl = availableStylesUrl;
+        lstAvailableSources = new JList(availableSourcesModel = new AvailableSourcesListModel(selectionModel));
+        lstAvailableSources.setSelectionModel(selectionModel);
+        lstAvailableSources.setCellRenderer(new SourceEntryListCellRenderer());
+        this.availableSourcesUrl = availableSourcesUrl;
 
         selectionModel = new DefaultListSelectionModel();
-        tblActiveStyles = new JTable(activeStylesModel = new ActiveStylesModel(selectionModel));
-        tblActiveStyles.putClientProperty("terminateEditOnFocusLost", true);
-        tblActiveStyles.setSelectionModel(selectionModel);
-        tblActiveStyles.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        tblActiveStyles.setShowGrid(false);
-        tblActiveStyles.setIntercellSpacing(new Dimension(0, 0));
-        tblActiveStyles.setTableHeader(null);
-        tblActiveStyles.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-        SourceEntryRenderer sourceEntryRenderer = new SourceEntryRenderer();
-        tblActiveStyles.getColumnModel().getColumn(0).setCellRenderer(sourceEntryRenderer);
-        activeStylesModel.addTableModelListener(new TableModelListener() {
+        tblActiveSources = new JTable(activeSourcesModel = new ActiveSourcesModel(selectionModel));
+        tblActiveSources.putClientProperty("terminateEditOnFocusLost", true);
+        tblActiveSources.setSelectionModel(selectionModel);
+        tblActiveSources.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        tblActiveSources.setShowGrid(false);
+        tblActiveSources.setIntercellSpacing(new Dimension(0, 0));
+        tblActiveSources.setTableHeader(null);
+        tblActiveSources.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        SourceEntryTableCellRenderer sourceEntryRenderer = new SourceEntryTableCellRenderer();
+        tblActiveSources.getColumnModel().getColumn(0).setCellRenderer(sourceEntryRenderer);
+        activeSourcesModel.addTableModelListener(new TableModelListener() {
             // Force swing to show horizontal scrollbars for the JTable
             // Yes, this is a little ugly, but should work
             @Override
             public void tableChanged(TableModelEvent e) {
-                adjustColumnWidth(tblActiveStyles, 0);
+                adjustColumnWidth(tblActiveSources, 0);
             }
         });
-        activeStylesModel.setActiveStyles(getInitialSourcesList());
+        activeSourcesModel.setActiveSources(getInitialSourcesList());
         
-        final EditActiveStyleAction editActiveStyleAction = new EditActiveStyleAction();
-        tblActiveStyles.getSelectionModel().addListSelectionListener(editActiveStyleAction);
-        tblActiveStyles.addMouseListener(new MouseAdapter() {
+        final EditActiveSourceAction editActiveSourceAction = new EditActiveSourceAction();
+        tblActiveSources.getSelectionModel().addListSelectionListener(editActiveSourceAction);
+        tblActiveSources.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() == 2) {
-                    int row = tblActiveStyles.rowAtPoint(e.getPoint());
-                    if (row < 0 || row >= tblActiveStyles.getRowCount())
+                    int row = tblActiveSources.rowAtPoint(e.getPoint());
+                    if (row < 0 || row >= tblActiveSources.getRowCount())
                         return;
-                    editActiveStyleAction.actionPerformed(null);
+                    editActiveSourceAction.actionPerformed(null);
                 }
             }
         });
 
-        RemoveActiveStylesAction removeActiveStylesAction = new RemoveActiveStylesAction();
-        tblActiveStyles.getSelectionModel().addListSelectionListener(removeActiveStylesAction);
-        tblActiveStyles.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "delete");
-        tblActiveStyles.getActionMap().put("delete", removeActiveStylesAction);
-
-        ActivateStylesAction activateStylesAction = new ActivateStylesAction();
-        lstAvailableStyles.addListSelectionListener(activateStylesAction);
-        JButton activate = new JButton(activateStylesAction);
+        RemoveActiveSourcesAction removeActiveSourcesAction = new RemoveActiveSourcesAction();
+        tblActiveSources.getSelectionModel().addListSelectionListener(removeActiveSourcesAction);
+        tblActiveSources.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "delete");
+        tblActiveSources.getActionMap().put("delete", removeActiveSourcesAction);
+
+        ActivateSourcesAction activateSourcesAction = new ActivateSourcesAction();
+        lstAvailableSources.addListSelectionListener(activateSourcesAction);
+        JButton activate = new JButton(activateSourcesAction);
 
         setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -172 +172 @@
         gbc.insets = new Insets(0, 11, 0, 0);
 
-        JScrollPane sp1 = new JScrollPane(lstAvailableStyles);
+        JScrollPane sp1 = new JScrollPane(lstAvailableSources);
         add(sp1, gbc);
 
@@ -193 +193 @@
         gbc.fill = GBC.BOTH;
 
-        JScrollPane sp = new JScrollPane(tblActiveStyles);
+        JScrollPane sp = new JScrollPane(tblActiveSources);
         add(sp, gbc);
         sp.setColumnHeaderView(null);
@@ -206 +206 @@
         sideButtonTB.setBorderPainted(false);
         sideButtonTB.setOpaque(false);
-        sideButtonTB.add(new NewActiveStyleAction());
-        sideButtonTB.add(editActiveStyleAction);
-        sideButtonTB.add(removeActiveStylesAction);
+        sideButtonTB.add(new NewActiveSourceAction());
+        sideButtonTB.add(editActiveSourceAction);
+        sideButtonTB.add(removeActiveSourcesAction);
         add(sideButtonTB, gbc);
 
@@ -223 +223 @@
         bottomLeftTB.setBorderPainted(false);
         bottomLeftTB.setOpaque(false);
-        bottomLeftTB.add(new ReloadStylesAction(availableStylesUrl));
+        bottomLeftTB.add(new ReloadSourcesAction(availableSourcesUrl));
         middleTB.add(Box.createHorizontalGlue());
         add(bottomLeftTB, gbc);
@@ -312 +312 @@
      * Get the default list of entries (used when resetting the list).
      */
-    abstract public Collection<StyleSourceInfo> getDefault();
+    abstract public Collection<ExtendedSourceEntry> getDefault();
 
     /**
@@ -328 +328 @@
      * Identifiers for strings that need to be provided.
      */
-    protected enum I18nString { AVAILABLE_SOURCES, ACTIVE_SOURCES, NEW_SOURCE_ENTRY,
+    protected enum I18nString { AVAILABLE_SOURCES, ACTIVE_SOURCES, NEW_SOURCE_ENTRY_TOOLTIP, NEW_SOURCE_ENTRY,
             REMOVE_SOURCE_TOOLTIP, EDIT_SOURCE_TOOLTIP, ACTIVATE_TOOLTIP, RELOAD_ALL_AVAILABLE,
             LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
@@ -348 +348 @@
     }
 
-    public boolean hasActiveStylesChanged() {
+    public boolean hasActiveSourcesChanged() {
         Collection<? extends SourceEntry> prev = getInitialSourcesList();
-        List<SourceEntry> cur = activeStylesModel.getStyles();
+        List<SourceEntry> cur = activeSourcesModel.getSources();
         if (prev.size() != cur.size())
             return true;
@@ -364 +364 @@
     }
 
-    public Collection<SourceEntry> getActiveStyles() {
-        return activeStylesModel.getStyles();
+    public Collection<SourceEntry> getActiveSources() {
+        return activeSourcesModel.getSources();
     }
 
     public void removeSources(Collection<Integer> idxs) {
-        activeStylesModel.removeIdxs(idxs);
-    }
-
-    protected void reloadAvailableStyles(String url) {
-        Main.worker.submit(new StyleSourceLoader(url));
-    }
-
-    public void initiallyLoadAvailableStyles() {
-        if (!stylesInitiallyLoaded) {
-            reloadAvailableStyles(this.availableStylesUrl);
-        }
-        stylesInitiallyLoaded = true;
-    }
-
-    protected static class AvailableStylesListModel extends DefaultListModel {
-        private ArrayList<StyleSourceInfo> data;
+        activeSourcesModel.removeIdxs(idxs);
+    }
+
+    protected void reloadAvailableSources(String url) {
+        Main.worker.submit(new SourceLoader(url));
+    }
+
+    public void initiallyLoadAvailableSources() {
+        if (!sourcesInitiallyLoaded) {
+            reloadAvailableSources(this.availableSourcesUrl);
+        }
+        sourcesInitiallyLoaded = true;
+    }
+
+    protected static class AvailableSourcesListModel extends DefaultListModel {
+        private ArrayList<ExtendedSourceEntry> data;
         private DefaultListSelectionModel selectionModel;
 
-        public AvailableStylesListModel(DefaultListSelectionModel selectionModel) {
-            data = new ArrayList<StyleSourceInfo>();
+        public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) {
+            data = new ArrayList<ExtendedSourceEntry>();
             this.selectionModel = selectionModel;
         }
 
-        public void setStyleSources(List<StyleSourceInfo> styleSources) {
+        public void setSources(List<ExtendedSourceEntry> sources) {
             data.clear();
-            if (styleSources != null) {
-                data.addAll(styleSources);
+            if (sources != null) {
+                data.addAll(sources);
             }
             fireContentsChanged(this, 0, data.size());
@@ -412 +412 @@
 
         public void deleteSelected() {
-            Iterator<StyleSourceInfo> it = data.iterator();
+            Iterator<ExtendedSourceEntry> it = data.iterator();
             int i=0;
             while(it.hasNext()) {
@@ -424 +424 @@
         }
 
-        public List<StyleSourceInfo> getSelected() {
-            ArrayList<StyleSourceInfo> ret = new ArrayList<StyleSourceInfo>();
+        public List<ExtendedSourceEntry> getSelected() {
+            ArrayList<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
             for(int i=0; i<data.size();i++) {
                 if (selectionModel.isSelectedIndex(i)) {
@@ -435 +435 @@
     }
 
-    protected static class ActiveStylesModel extends AbstractTableModel {
+    protected static class ActiveSourcesModel extends AbstractTableModel {
         private List<SourceEntry> data;
         private DefaultListSelectionModel selectionModel;
 
-        public ActiveStylesModel(DefaultListSelectionModel selectionModel) {
+        public ActiveSourcesModel(DefaultListSelectionModel selectionModel) {
             this.selectionModel = selectionModel;
             this.data = new ArrayList<SourceEntry>();
@@ -464 +464 @@
         @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-            updateStyle(rowIndex, (String)aValue);
-        }
-
-        public void setActiveStyles(Collection<? extends SourceEntry> sources) {
-            //abstract public Collection<? extends StyleSourceEntry> getInitialStyleSources();
+            updateSource(rowIndex, (String)aValue);
+        }
+
+        public void setActiveSources(Collection<? extends SourceEntry> sources) {
             data.clear();
             if (sources != null) {
@@ -476 +475 @@
         }
 
-        public void addStyle(SourceEntry style) {
-            if (style == null) return;
-            data.add(style);
+        public void addSource(SourceEntry entry) {
+            if (entry == null) return;
+            data.add(entry);
             fireTableDataChanged();
-            int idx = data.indexOf(style);
+            int idx = data.indexOf(entry);
             if (idx >= 0) {
                 selectionModel.setSelectionInterval(idx, idx);
@@ -486 +485 @@
         }
 
-        public void updateStyle(int pos, String style) {
-            if (style == null) return;
+        public void updateSource(int pos, String src) {
+            if (src == null) return;
             if (pos < 0 || pos >= getRowCount()) return;
-            data.get(pos).url = style;
+            data.get(pos).url = src;
             fireTableDataChanged();
-            int idx = data.indexOf(style);
+            int idx = data.indexOf(src);
             if (idx >= 0) {
                 selectionModel.setSelectionInterval(idx, idx);
@@ -521 +520 @@
         }
 
-        public void addStylesFromSources(List<StyleSourceInfo> sources) {
+        public void addExtendedSourceEntries(List<ExtendedSourceEntry> sources) {
             if (sources == null) return;
-            for (StyleSourceInfo info: sources) {
+            for (ExtendedSourceEntry info: sources) {
                 data.add(new SourceEntry(info.url, info.name, info.getDisplayName(), true));
             }
             fireTableDataChanged();
             selectionModel.clearSelection();
-            for (StyleSourceInfo info: sources) {
+            for (ExtendedSourceEntry info: sources) {
                 int pos = data.indexOf(info);
                 if (pos >=0) {
@@ -536 +535 @@
         }
 
-        public List<SourceEntry> getStyles() {
+        public List<SourceEntry> getSources() {
             return new ArrayList<SourceEntry>(data);
         }
     }
 
-    public static class StyleSourceInfo extends SourceEntry {
+    public static class ExtendedSourceEntry extends SourceEntry {
         public String simpleFileName;
         public String version;
@@ -548 +547 @@
         public String description;
 
-        public StyleSourceInfo(String simpleFileName, String url) {
+        public ExtendedSourceEntry(String simpleFileName, String url) {
             super(url, null, null, true);
             this.simpleFileName = simpleFileName;
@@ -656 +655 @@
                 JFileChooser fc= new JFileChooser();
                 prepareFileChooser(tfURL.getText(), fc);
-                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(StyleSourceEditor.this));
+                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this));
                 if (ret != JFileChooser.APPROVE_OPTION)
                     return;
@@ -672 +671 @@
     }
 
-    class NewActiveStyleAction extends AbstractAction {
-        public NewActiveStyleAction() {
+    class NewActiveSourceAction extends AbstractAction {
+        public NewActiveSourceAction() {
             putValue(NAME, tr("New"));
-            putValue(SHORT_DESCRIPTION, tr("Add a filename or an URL of an active style"));
+            putValue(SHORT_DESCRIPTION, getStr(I18nString.NEW_SOURCE_ENTRY_TOOLTIP));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
         }
@@ -681 +680 @@
         public void actionPerformed(ActionEvent evt) {
             EditSourceEntryDialog editEntryDialog = new EditSourceEntryDialog(
-                    StyleSourceEditor.this,
+                    SourceEditor.this,
                     getStr(I18nString.NEW_SOURCE_ENTRY),
                     null);
             editEntryDialog.showDialog();
             if (editEntryDialog.getValue() == 1) {
-                activeStylesModel.addStyle(new SourceEntry(
+                activeSourcesModel.addSource(new SourceEntry(
                         editEntryDialog.getURL(),
                         null, editEntryDialog.getShortdescription(), true));
-                activeStylesModel.fireTableDataChanged();
-            }
-        }
-    }
-
-    class RemoveActiveStylesAction extends AbstractAction implements ListSelectionListener {
-
-        public RemoveActiveStylesAction() {
+                activeSourcesModel.fireTableDataChanged();
+            }
+        }
+    }
+
+    class RemoveActiveSourcesAction extends AbstractAction implements ListSelectionListener {
+
+        public RemoveActiveSourcesAction() {
             putValue(NAME, tr("Remove"));
             putValue(SHORT_DESCRIPTION, getStr(I18nString.REMOVE_SOURCE_TOOLTIP));
@@ -704 +703 @@
 
         protected void updateEnabledState() {
-            setEnabled(tblActiveStyles.getSelectedRowCount() > 0);
+            setEnabled(tblActiveSources.getSelectedRowCount() > 0);
         }
 
@@ -712 +711 @@
 
         public void actionPerformed(ActionEvent e) {
-            activeStylesModel.removeSelected();
-        }
-    }
-
-    class EditActiveStyleAction extends AbstractAction implements ListSelectionListener {
-        public EditActiveStyleAction() {
+            activeSourcesModel.removeSelected();
+        }
+    }
+
+    class EditActiveSourceAction extends AbstractAction implements ListSelectionListener {
+        public EditActiveSourceAction() {
             putValue(NAME, tr("Edit"));
             putValue(SHORT_DESCRIPTION, getStr(I18nString.EDIT_SOURCE_TOOLTIP));
@@ -725 +724 @@
 
         protected void updateEnabledState() {
-            setEnabled(tblActiveStyles.getSelectedRowCount() == 1);
+            setEnabled(tblActiveSources.getSelectedRowCount() == 1);
         }
 
@@ -733 +732 @@
 
         public void actionPerformed(ActionEvent evt) {
-            int pos = tblActiveStyles.getSelectedRow();
-            if (pos < 0 || pos >= tblActiveStyles.getRowCount())
+            int pos = tblActiveSources.getSelectedRow();
+            if (pos < 0 || pos >= tblActiveSources.getRowCount())
                 return;
 
-            SourceEntry e = activeStylesModel.getValueAt(pos, 0);
+            SourceEntry e = activeSourcesModel.getValueAt(pos, 0);
 
             EditSourceEntryDialog editEntryDialog = new EditSourceEntryDialog(
-                    StyleSourceEditor.this, tr("Edit source entry:"), e);
+                    SourceEditor.this, tr("Edit source entry:"), e);
             editEntryDialog.showDialog();
             if (editEntryDialog.getValue() == 1) {
@@ -750 +749 @@
                 }
                 e.url = editEntryDialog.getURL();
-                activeStylesModel.fireTableCellUpdated(pos, 0);
-            }
-        }
-    }
-
-    class ActivateStylesAction extends AbstractAction implements ListSelectionListener {
-        public ActivateStylesAction() {
+                activeSourcesModel.fireTableCellUpdated(pos, 0);
+            }
+        }
+    }
+
+    class ActivateSourcesAction extends AbstractAction implements ListSelectionListener {
+        public ActivateSourcesAction() {
             putValue(SHORT_DESCRIPTION, getStr(I18nString.ACTIVATE_TOOLTIP));
             putValue(SMALL_ICON, ImageProvider.get("preferences", "activatestyle"));
@@ -763 +762 @@
 
         protected void updateEnabledState() {
-            setEnabled(lstAvailableStyles.getSelectedIndices().length > 0);
+            setEnabled(lstAvailableSources.getSelectedIndices().length > 0);
         }
 
@@ -771 +770 @@
 
         public void actionPerformed(ActionEvent e) {
-            List<StyleSourceInfo> styleSources = availableStylesModel.getSelected();
-            activeStylesModel.addStylesFromSources(styleSources);
+            List<ExtendedSourceEntry> sources = availableSourcesModel.getSelected();
+            activeSourcesModel.addExtendedSourceEntries(sources);
         }
     }
@@ -785 +784 @@
 
         public void actionPerformed(ActionEvent e) {
-            activeStylesModel.setActiveStyles(getDefault());
-        }
-    }
-
-    class ReloadStylesAction extends AbstractAction {
+            activeSourcesModel.setActiveSources(getDefault());
+        }
+    }
+
+    class ReloadSourcesAction extends AbstractAction {
         private String url;
-        public ReloadStylesAction(String url) {
+        public ReloadSourcesAction(String url) {
             putValue(NAME, tr("Reload"));
             putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url));
@@ -800 +799 @@
         public void actionPerformed(ActionEvent e) {
             MirroredInputStream.cleanup(url);
-            reloadAvailableStyles(url);
+            reloadAvailableSources(url);
         }
     }
@@ -835 +834 @@
         }
 
-        public void setIconPaths(Collection<String> styles) {
+        public void setIconPaths(Collection<String> paths) {
             data.clear();
-            if (styles !=null) {
-                data.addAll(styles);
+            if (paths !=null) {
+                data.addAll(paths);
             }
             sort();
@@ -957 +956 @@
     }
 
-    static class StyleSourceCellRenderer extends JLabel implements ListCellRenderer {
+    static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer {
         public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
                 boolean cellHasFocus) {
@@ -973 +972 @@
             setFont(getFont().deriveFont(Font.PLAIN));
             setOpaque(true);
-            setToolTipText(((StyleSourceInfo) value).getTooltip());
+            setToolTipText(((ExtendedSourceEntry) value).getTooltip());
             return this;
         }
     }
 
-    class StyleSourceLoader extends PleaseWaitRunnable {
+    class SourceLoader extends PleaseWaitRunnable {
         private String url;
         private BufferedReader reader;
         private boolean canceled;
 
-        public StyleSourceLoader(String url) {
+        public SourceLoader(String url) {
             super(tr(getStr(I18nString.LOADING_SOURCES_FROM), url));
             this.url = url;
@@ -1019 +1018 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            LinkedList<StyleSourceInfo> styles = new LinkedList<StyleSourceInfo>();
+            LinkedList<ExtendedSourceEntry> sources = new LinkedList<ExtendedSourceEntry>();
             String lang = LanguageInfo.getLanguageCodeXML();
             try {
-                styles.addAll(getDefault());
+                sources.addAll(getDefault());
                 MirroredInputStream stream = new MirroredInputStream(url);
                 InputStreamReader r;
@@ -1033 +1032 @@
 
                 String line;
-                StyleSourceInfo last = null;
+                ExtendedSourceEntry last = null;
 
                 while ((line = reader.readLine()) != null && !canceled) {
@@ -1074 +1073 @@
                         Matcher m = Pattern.compile("^(.+);(.+)$").matcher(line);
                         if (m.matches()) {
-                            styles.add(last = new StyleSourceInfo(m.group(1), m.group(2)));
+                            sources.add(last = new ExtendedSourceEntry(m.group(1), m.group(2)));
                         } else {
                             System.err.println(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line));
@@ -1089 +1088 @@
                 return;
             }
-            availableStylesModel.setStyleSources(styles);
+            availableSourcesModel.setSources(sources);
         }
     }
     
-    class SourceEntryRenderer extends DefaultTableCellRenderer {
+    class SourceEntryTableCellRenderer extends DefaultTableCellRenderer {
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
@@ -1265 +1264 @@
                 JFileChooser fc = getFileChooser();
                 prepareFileChooser(tfFileName.getText(), fc);
-                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(StyleSourceEditor.this));
+                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this));
                 if (ret != JFileChooser.APPROVE_OPTION)
                     return;
@@ -1314 +1313 @@
         }
 
-        abstract public Collection<StyleSourceInfo> getDefault();
+        abstract public Collection<ExtendedSourceEntry> getDefault();
 
         abstract public Collection<String> serialize(SourceEntry entry);

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
-import org.openstreetmap.josm.gui.preferences.StyleSourceEditor.StyleSourceInfo;
+import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
@@ -46 +46 @@
 
     public static Collection<TaggingPreset> taggingPresets;
-    private StyleSourceEditor sources;
+    private SourceEditor sources;
     private JCheckBox sortMenu;
 
     private ValidationListener validationListener = new ValidationListener() {
         public boolean validatePreferences() {
-            if (sources.hasActiveStylesChanged()) {
+            if (sources.hasActiveSourcesChanged()) {
                 List<Integer> sourcesToRemove = new ArrayList<Integer>();
                 int i = -1;
                 SOURCES:
-                    for (SourceEntry source: sources.getActiveStyles()) {
+                    for (SourceEntry source: sources.getActiveSources()) {
                         i++;
                         boolean canLoad = false;
@@ -153 +153 @@
                     public void stateChanged(ChangeEvent e) {
                         if (gui.mapcontent.getSelectedComponent() == panel) {
-                            sources.initiallyLoadAvailableStyles();
+                            sources.initiallyLoadAvailableSources();
                         }
                     }
@@ -161 +161 @@
     }
 
-    class TaggingPresetSourceEditor extends StyleSourceEditor {
+    class TaggingPresetSourceEditor extends SourceEditor {
 
         final private String iconpref = "taggingpreset.icon.sources";
@@ -176 +176 @@
         @Override
         public boolean finish() {
-            List<SourceEntry> activeStyles = activeStylesModel.getStyles();
+            List<SourceEntry> activeStyles = activeSourcesModel.getSources();
 
             boolean changed = (new PresetPrefMigration()).put(activeStyles);
@@ -195 +195 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
+        public Collection<ExtendedSourceEntry> getDefault() {
             return (new PresetPrefMigration()).getDefault();
         }
@@ -211 +211 @@
                 case ACTIVE_SOURCES:
                     return tr("Active presets:");
+                case NEW_SOURCE_ENTRY_TOOLTIP:
+                     return tr("Add a new preset by entering filename or URL");
                 case NEW_SOURCE_ENTRY:
                     return tr("New preset entry:");
@@ -287 +289 @@
     }
 
-    public static class PresetPrefMigration extends StyleSourceEditor.SourcePrefMigration {
+    public static class PresetPrefMigration extends SourceEditor.SourcePrefMigration {
 
         public PresetPrefMigration() {
@@ -296 +298 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
-            StyleSourceInfo i = new StyleSourceInfo("defaultpresets.xml", "resource://data/defaultpresets.xml");
+        public Collection<ExtendedSourceEntry> getDefault() {
+            ExtendedSourceEntry i = new ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");
             i.shortdescription = tr("Internal Preset");
             i.description = tr("The default preset for JOSM");