Index: unk/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java (revision 14004) +++ (revision ) @@ -1,23 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.actions; - -import java.util.Collection; - -import javax.swing.Action; - -import org.openstreetmap.josm.data.osm.OsmPrimitive; - -/** - * Interface used to enable/disable all primitive-related actions, even those registered by plugins. - * @since 5821 - * @deprecated Use {@link IPrimitiveAction} instead - */ -@Deprecated -public interface OsmPrimitiveAction extends Action { - - /** - * Specifies the working set of primitives. - * @param primitives The new working set of primitives. Can be null or empty - */ - void setPrimitives(Collection primitives); -} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 14005) @@ -1359,17 +1359,4 @@ } - /** - * Gets a collection of primitives that should not be hidden by the filter. - * @return The primitives that the filter should not hide. - * @deprecated use {@link org.openstreetmap.josm.data.osm.DataSet#allPreservedPrimitives} - * @since 11993 - */ - @Override - @Deprecated - public Collection getPreservedPrimitives() { - DataSet ds = getLayerManager().getEditDataSet(); - return ds != null ? ds.allPreservedPrimitives() : Collections.emptySet(); - } - @Override public boolean layerIsSupported(Layer l) { Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 14005) @@ -8,11 +8,8 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.util.Collection; -import java.util.Collections; import javax.swing.Action; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.MapFrame; @@ -237,15 +234,4 @@ /** - * Gets a collection of primitives that should not be hidden by the filter. - * @return The primitives that the filter should not hide. - * @deprecated use {@link org.openstreetmap.josm.data.osm.DataSet#allPreservedPrimitives} - * @since 11993 - */ - @Deprecated - public Collection getPreservedPrimitives() { - return Collections.emptySet(); - } - - /** * Determines if the given layer is a data layer that can be modified. * Useful for {@link #layerIsSupported(Layer)} implementations. Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 14005) @@ -238,49 +238,4 @@ /** - * Returns the user defined preferences directory, containing the preferences.xml file - * @return The user defined preferences directory, containing the preferences.xml file - * @since 7834 - * @deprecated use {@link #getPreferencesDirectory(boolean)} - */ - @Deprecated - public File getPreferencesDirectory() { - return getPreferencesDirectory(false); - } - - /** - * @param createIfMissing if true, automatically creates this directory, - * in case it is missing - * @return the preferences directory - * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} - */ - @Deprecated - public File getPreferencesDirectory(boolean createIfMissing) { - return dirs.getPreferencesDirectory(createIfMissing); - } - - /** - * Returns the user data directory, containing autosave, plugins, etc. - * Depending on the OS it may be the same directory as preferences directory. - * @return The user data directory, containing autosave, plugins, etc. - * @since 7834 - * @deprecated use {@link #getUserDataDirectory(boolean)} - */ - @Deprecated - public File getUserDataDirectory() { - return getUserDataDirectory(false); - } - - /** - * @param createIfMissing if true, automatically creates this directory, - * in case it is missing - * @return the user data directory - * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} - */ - @Deprecated - public File getUserDataDirectory(boolean createIfMissing) { - return dirs.getUserDataDirectory(createIfMissing); - } - - /** * Returns the user preferences file (preferences.xml). * @return The user preferences file (preferences.xml) @@ -304,28 +259,4 @@ public File getPluginsDirectory() { return new File(dirs.getUserDataDirectory(false), "plugins"); - } - - /** - * Get the directory where cached content of any kind should be stored. - * - * If the directory doesn't exist on the file system, it will be created by this method. - * - * @return the cache directory - * @deprecated use {@link #getCacheDirectory(boolean)} - */ - @Deprecated - public File getCacheDirectory() { - return getCacheDirectory(true); - } - - /** - * @param createIfMissing if true, automatically creates this directory, - * in case it is missing - * @return the cache directory - * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} - */ - @Deprecated - public File getCacheDirectory(boolean createIfMissing) { - return dirs.getCacheDirectory(createIfMissing); } Index: /trunk/src/org/openstreetmap/josm/data/osm/Tag.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Tag.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/data/osm/Tag.java (revision 14005) @@ -10,5 +10,4 @@ import org.openstreetmap.josm.tools.CheckParameterUtil; -import org.openstreetmap.josm.tools.Utils; /** @@ -141,16 +140,4 @@ /** - * Removes leading, trailing, and multiple inner whitespaces from the given string, to be used as a key or value. - * @param s The string - * @return The string without leading, trailing or multiple inner whitespaces - * @since 6699 - * @deprecated since 13597. Use {@link Utils#removeWhiteSpaces(String)} instead - */ - @Deprecated - public static String removeWhiteSpaces(String s) { - return Utils.removeWhiteSpaces(s); - } - - /** * Unsupported. * @param keys ignored Index: unk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 14004) +++ (revision ) @@ -1,129 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui; - -import java.awt.Component; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JTable; -import javax.swing.ListCellRenderer; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellRenderer; - -import org.openstreetmap.josm.data.osm.DefaultNameFormatter; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive; -import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.Logging; - -/** - * Renderer that renders the objects from an OsmPrimitive as data. - * - * Can be used in lists and tables. - * - * @author imi - * @author Frederik Ramm - * @deprecated since 13564. Use {@link PrimitiveRenderer} instead - */ -@Deprecated -public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer { - private final DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); - - /** - * Default list cell renderer - delegate for ListCellRenderer operation - */ - private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer(); - - /** - * Default table cell renderer - delegate for TableCellRenderer operation - */ - private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer(); - - /** - * Adapter method supporting the ListCellRenderer interface. - */ - @Override - public Component getListCellRendererComponent(JList list, OsmPrimitive value, int index, - boolean isSelected, boolean cellHasFocus) { - Component def = defaultListCellRenderer.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus); - return renderer(def, value, list.getModel().getSize() > 1000); - } - - /** - * Adapter method supporting the TableCellRenderer interface. - */ - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component def = defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (value instanceof OsmPrimitive) - return renderer(def, (OsmPrimitive) value, table.getModel().getRowCount() > 1000); - else if (value instanceof HistoryOsmPrimitive) - return renderer(def, (HistoryOsmPrimitive) value); - else - return def; - } - - /** - * Internal method that stuffs information into the rendering component - * provided that it's a kind of JLabel. - * @param def the rendering component - * @param value the OsmPrimitive to render - * @param fast whether the icons should be loaded fast since many items are being displayed - * @return the modified rendering component - */ - private Component renderer(Component def, OsmPrimitive value, boolean fast) { - if (value != null && def instanceof JLabel) { - ((JLabel) def).setText(getComponentText(value)); - final ImageIcon icon = fast - ? ImageProvider.get(value.getType()) - : ImageProvider.getPadded(value, - // Height of component no yet known, assume the default 16px. - ImageProvider.ImageSizes.SMALLICON.getImageDimension()); - if (icon != null) { - ((JLabel) def).setIcon(icon); - } else { - Logging.warn("Null icon for "+value.getDisplayType()); - } - ((JLabel) def).setToolTipText(getComponentToolTipText(value)); - } - return def; - } - - /** - * Internal method that stuffs information into the rendering component - * provided that it's a kind of JLabel. - * @param def the rendering component - * @param value the HistoryOsmPrimitive to render - * @return the modified rendering component - */ - private Component renderer(Component def, HistoryOsmPrimitive value) { - if (value != null && def instanceof JLabel) { - ((JLabel) def).setText(value.getDisplayName(DefaultNameFormatter.getInstance())); - ((JLabel) def).setIcon(ImageProvider.get(value.getType())); - ((JLabel) def).setToolTipText(formatter.buildDefaultToolTip(value)); - } - return def; - } - - /** - * Returns the text representing an OSM primitive in a component. - * Can be overridden to customize the text - * @param value OSM primitive - * @return text representing the OSM primitive - */ - protected String getComponentText(OsmPrimitive value) { - return value.getDisplayName(DefaultNameFormatter.getInstance()); - } - - /** - * Returns the text representing an OSM primitive in a tooltip. - * Can be overridden to customize the ToolTipText - * @param value OSM primitive - * @return text representing the OSM primitive - */ - protected String getComponentToolTipText(OsmPrimitive value) { - return formatter.buildDefaultToolTip(value); - } -} Index: /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (revision 14005) @@ -74,14 +74,4 @@ * Gets the data layer that was previously used. * @return The old data layer, null if there is none. - * @deprecated use {@link #getPreviousDataLayer} - */ - @Deprecated - public OsmDataLayer getPreviousEditLayer() { - return getPreviousDataLayer(); - } - - /** - * Gets the data layer that was previously used. - * @return The old data layer, null if there is none. * @since 13434 */ @@ -96,14 +86,4 @@ public Layer getPreviousActiveLayer() { return previousActiveLayer; - } - - /** - * Gets the data set that was previously used. - * @return The data set of {@link #getPreviousDataLayer()}. - * @deprecated use {@link #getPreviousDataSet} - */ - @Deprecated - public DataSet getPreviousEditDataSet() { - return getPreviousDataSet(); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 14005) @@ -17,17 +17,4 @@ protected String name; protected String id; - - /** - * Constructs a new {@code AbstractProjectionChoice}. - * - * @param name short name of the projection choice as shown in the GUI - * @param id unique identifier for the projection choice - * @param cacheDir unused - * @deprecated use {@link #AbstractProjectionChoice(String, String)} instead - */ - @Deprecated - public AbstractProjectionChoice(String name, String id, String cacheDir) { - this(name, id); - } /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 14005) @@ -277,18 +277,4 @@ * @param id short name of the projection choice as shown in the GUI * @param epsg the unique numeric EPSG identifier for the projection - * @param cacheDir unused - * @return the registered {@link ProjectionChoice} - * @deprecated use {@link #registerProjectionChoice(String, String, Integer)} instead - */ - @Deprecated - public static ProjectionChoice registerProjectionChoice(String name, String id, Integer epsg, String cacheDir) { - return registerProjectionChoice(name, id, epsg); - } - - /** - * Registers a new projection choice. - * @param name short name of the projection choice as shown in the GUI - * @param id short name of the projection choice as shown in the GUI - * @param epsg the unique numeric EPSG identifier for the projection * @return the registered {@link ProjectionChoice} */ Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java (revision 14005) @@ -16,18 +16,4 @@ protected String code; - - /** - * Constructs a new {@code SingleProjectionChoice}. - * - * @param name short name of the projection choice as shown in the GUI - * @param id unique identifier for the projection choice, e.g. "core:thisproj" - * @param code the unique identifier for the projection, e.g. "EPSG:1234" - * @param cacheDir unused - * @deprecated use {@link #SingleProjectionChoice(String, String, String)} instead - */ - @Deprecated - public SingleProjectionChoice(String name, String id, String code, String cacheDir) { - this(name, id, code); - } /** Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 14005) @@ -285,28 +285,4 @@ /** - * Download BZip2-compressed OSM Change files from somewhere - * @param progressMonitor The progress monitor - * @return The corresponding dataset - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseOsmChange(ProgressMonitor, Compression)} instead - */ - @Deprecated - public DataSet parseOsmChangeBzip2(ProgressMonitor progressMonitor) throws OsmTransferException { - return parseOsmChange(progressMonitor, Compression.BZIP2); - } - - /** - * Download GZip-compressed OSM Change files from somewhere - * @param progressMonitor The progress monitor - * @return The corresponding dataset - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseOsmChange(ProgressMonitor, Compression)} instead - */ - @Deprecated - public DataSet parseOsmChangeGzip(ProgressMonitor progressMonitor) throws OsmTransferException { - return parseOsmChange(progressMonitor, Compression.GZIP); - } - - /** * Retrieve raw gps waypoints from the server API. * @param progressMonitor The progress monitor @@ -328,54 +304,4 @@ public GpxData parseRawGps(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException { return null; - } - - /** - * Retrieve BZip2-compressed GPX files from somewhere. - * @param progressMonitor The progress monitor - * @return The corresponding GPX tracks - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseRawGps(ProgressMonitor, Compression)} instead - * @since 6244 - */ - @Deprecated - public GpxData parseRawGpsBzip2(ProgressMonitor progressMonitor) throws OsmTransferException { - return parseRawGps(progressMonitor, Compression.BZIP2); - } - - /** - * Download BZip2-compressed OSM files from somewhere - * @param progressMonitor The progress monitor - * @return The corresponding dataset - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead - */ - @Deprecated - public DataSet parseOsmBzip2(ProgressMonitor progressMonitor) throws OsmTransferException { - return parseOsm(progressMonitor, Compression.BZIP2); - } - - /** - * Download GZip-compressed OSM files from somewhere - * @param progressMonitor The progress monitor - * @return The corresponding dataset - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead - */ - @Deprecated - public DataSet parseOsmGzip(ProgressMonitor progressMonitor) throws OsmTransferException { - return parseOsm(progressMonitor, Compression.GZIP); - } - - /** - * Download Zip-compressed OSM files from somewhere - * @param progressMonitor The progress monitor - * @return The corresponding dataset - * @throws OsmTransferException if any error occurs - * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead - * @since 6882 - */ - @Deprecated - public DataSet parseOsmZip(final ProgressMonitor progressMonitor) throws OsmTransferException { - return parseOsm(progressMonitor, Compression.ZIP); } @@ -445,16 +371,4 @@ public List parseRawNotes(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException { return null; - } - - /** - * Download notes from a URL that contains a bzip2 compressed notes dump file - * @param progressMonitor progress monitor - * @return A list of notes parsed from the URL - * @throws OsmTransferException if any error occurs during dialog with OSM API - * @deprecated Use {@link #parseRawNotes(ProgressMonitor, Compression)} instead - */ - @Deprecated - public List parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException { - return parseRawNotes(progressMonitor, Compression.BZIP2); } Index: /trunk/src/org/openstreetmap/josm/plugins/Plugin.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/Plugin.java (revision 14004) +++ /trunk/src/org/openstreetmap/josm/plugins/Plugin.java (revision 14005) @@ -5,11 +5,6 @@ import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; import java.net.URL; import java.net.URLClassLoader; -import java.nio.file.Files; -import java.nio.file.StandardCopyOption; import java.security.AccessController; import java.security.PrivilegedAction; @@ -138,15 +133,4 @@ } - /** - * @return The directory for the plugin to store all kind of stuff. - * @deprecated (since 13007) to get the same directory as this method, use {@code getPluginDirs().getUserDataDirectory(false)}. - * However, for files that can be characterized as cache or preferences, you are encouraged to use the appropriate - * {@link IBaseDirectories} method from {@link #getPluginDirs()}. - */ - @Deprecated - public String getPluginDir() { - return new File(Main.pref.getPluginsDirectory(), info.name).getPath(); - } - @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {} @@ -167,28 +151,4 @@ */ public void addDownloadSelection(List list) {} - - /** - * Copies the resource 'from' to the file in the plugin directory named 'to'. - * @param from source file - * @param to target file - * @throws FileNotFoundException if the file exists but is a directory rather than a regular file, - * does not exist but cannot be created, or cannot be opened for any other reason - * @throws IOException if any other I/O error occurs - * @deprecated without replacement - */ - @Deprecated - public void copy(String from, String to) throws IOException { - String pluginDirName = getPluginDir(); - File pluginDir = new File(pluginDirName); - if (!pluginDir.exists()) { - Utils.mkDirs(pluginDir); - } - try (InputStream in = getClass().getResourceAsStream(from)) { - if (in == null) { - throw new IOException("Resource not found: "+from); - } - Files.copy(in, new File(pluginDirName, to).toPath(), StandardCopyOption.REPLACE_EXISTING); - } - } /** Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (revision 14004) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (revision 14005) @@ -4,5 +4,4 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -103,15 +102,3 @@ } } - - /** - * Non regression test case for bug #14762. - * @deprecated test to remove - */ - @Test - @Deprecated - public void testTicket14762() { - DrawAction action = new DrawAction(); - assertNull(action.getLayerManager().getEditDataSet()); - assertEquals(0, action.getPreservedPrimitives().size()); - } }