Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java (revision 33269) @@ -1,3 +1,9 @@ package org.openstreetmap.josm.plugins.rasterfilters; + +import java.awt.Container; +import java.io.File; +import java.io.IOException; + +import javax.swing.JPanel; import org.openstreetmap.josm.Main; @@ -15,13 +21,9 @@ import org.openstreetmap.josm.plugins.Plugin; import org.openstreetmap.josm.plugins.PluginInformation; -import org.openstreetmap.josm.plugins.rasterfilters.actions.ShowLayerFiltersDialog; +import org.openstreetmap.josm.plugins.rasterfilters.actions.ShowFiltersDialogAction; import org.openstreetmap.josm.plugins.rasterfilters.gui.FiltersDialog; import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader; import org.openstreetmap.josm.plugins.rasterfilters.preferences.RasterFiltersPreferences; -import javax.swing.*; -import java.awt.*; -import java.io.File; -import java.io.IOException; /** @@ -30,10 +32,9 @@ * * @author Nipel-Crumple - * */ public class RasterFiltersPlugin extends Plugin implements LayerChangeListener, ActiveLayerChangeListener { private SideButton filterButton; - private ShowLayerFiltersDialog action; + private ShowFiltersDialogAction action; private PreferenceSetting setting; @@ -86,5 +87,5 @@ if (action == null) { - action = new ShowLayerFiltersDialog(); + action = new ShowFiltersDialogAction(); } @@ -122,6 +123,7 @@ if (Main.getLayerManager().getLayers().isEmpty()) { Container container = filterButton.getParent(); - if (container != null) + if (container != null) { container.remove(filterButton); + } FiltersDownloader.destroyFilters(); Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java (revision 33269) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java (revision 33269) @@ -0,0 +1,91 @@ +package org.openstreetmap.josm.plugins.rasterfilters.actions; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.layer.ImageryLayer; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.LayerAction; +import org.openstreetmap.josm.plugins.rasterfilters.gui.FiltersDialog; +import org.openstreetmap.josm.tools.ImageProvider; + +import static org.openstreetmap.josm.tools.I18n.tr; + +/** + * The action that is called when user click on 'Choose filters' button + * + * @author Nipel-Crumple + */ +public final class ShowFiltersDialogAction extends AbstractAction implements LayerAction { + + private List dialogs = new ArrayList<>(); + + /** + * Constructs a new {@code ShowFiltersDialogAction}. + */ + public ShowFiltersDialogAction() { + putValue(NAME, tr("Filters")); + putValue(SHORT_DESCRIPTION, tr("Choose Filter")); + putValue("ImageResource", new ImageProvider("josm_filters_48.png").getResource()); + } + + public void addFiltersDialog(FiltersDialog dialog) { + dialogs.add(dialog); + } + + public void removeFiltersDialog(FiltersDialog dialog) { + dialogs.remove(dialog); + } + + @Override + public void actionPerformed(ActionEvent e) { + + Layer layer = Main.getLayerManager().getActiveLayer(); + + if (layer instanceof ImageryLayer) { + for (FiltersDialog temp : dialogs) { + + if (temp.getLayer().equals(layer)) { + try { + temp.createAndShowGui(); + } catch (MalformedURLException e1) { + e1.printStackTrace(); + } + break; + } + + } + } else { + Main.debug("The layer is not the instance of " + ImageryLayer.class.getCanonicalName()); + } + } + + public FiltersDialog getDialogByLayer(Layer layer) { + for (FiltersDialog dialog : dialogs) { + + if (dialog.getLayer().equals(layer)) { + return dialog; + } + + } + + return null; + } + + @Override + public boolean supportLayers(List layers) { + return true; + } + + @Override + public Component createMenuComponent() { + return new JMenuItem(this); + } +} Index: plications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowLayerFiltersDialog.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowLayerFiltersDialog.java (revision 33268) +++ (revision ) @@ -1,89 +1,0 @@ -package org.openstreetmap.josm.plugins.rasterfilters.actions; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.layer.ImageryLayer; -import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.Layer.LayerAction; -import org.openstreetmap.josm.plugins.rasterfilters.gui.FiltersDialog; -import org.openstreetmap.josm.tools.ImageProvider; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.List; - -import static org.openstreetmap.josm.tools.I18n.tr; - -/** - * The action that is called when user click on 'Choose filters' button - *

- * and sets image on that button - * - * @author Nipel-Crumple - */ -public final class ShowLayerFiltersDialog extends AbstractAction implements LayerAction { - - private List dialogs = new ArrayList<>(); - - /** - * Constructs a new {@code ShowLayerFiltersDialog}. - */ - public ShowLayerFiltersDialog() { - putValue(NAME, tr("Filters")); - putValue(SHORT_DESCRIPTION, tr("Choose Filter")); - putValue(SMALL_ICON, ImageProvider.get("josm_filters_48.png")); - } - - public void addFiltersDialog(FiltersDialog dialog) { - dialogs.add(dialog); - } - - public void removeFiltersDialog(FiltersDialog dialog) { - dialogs.remove(dialog); - } - - @Override - public void actionPerformed(ActionEvent e) { - - Layer layer = Main.getLayerManager().getActiveLayer(); - - if (layer instanceof ImageryLayer) { - for (FiltersDialog temp : dialogs) { - - if (temp.getLayer().equals(layer)) { - try { - temp.createAndShowGUI(); - } catch (MalformedURLException e1) { - e1.printStackTrace(); - } - break; - } - - } - } - } - - public FiltersDialog getDialogByLayer(Layer layer) { - for (FiltersDialog dialog : dialogs) { - - if (dialog.getLayer().equals(layer)) { - return dialog; - } - - } - - return null; - } - - @Override - public boolean supportLayers(List layers) { - return true; - } - - @Override - public Component createMenuComponent() { - return new JMenuItem(this); - } -} Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/filters/Filter.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/filters/Filter.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/filters/Filter.java (revision 33269) @@ -1,7 +1,8 @@ package org.openstreetmap.josm.plugins.rasterfilters.filters; -import javax.json.JsonObject; import java.awt.image.BufferedImage; import java.rmi.server.UID; + +import javax.json.JsonObject; /** @@ -27,5 +28,5 @@ * @return json object 'filterState' */ - public JsonObject changeFilterState(JsonObject filterState); + JsonObject changeFilterState(JsonObject filterState); /** @@ -37,5 +38,5 @@ * @return processed image */ - public BufferedImage applyFilter(BufferedImage img); + BufferedImage applyFilter(BufferedImage img); /** @@ -45,5 +46,5 @@ * @param id sets value of ID field */ - public void setId(UID id); + void setId(UID id); /** @@ -52,4 +53,4 @@ * @return id of filter */ - public UID getId(); + UID getId(); } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterGuiListener.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterGuiListener.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterGuiListener.java (revision 33269) @@ -1,16 +1,5 @@ package org.openstreetmap.josm.plugins.rasterfilters.gui; -import com.bric.swing.ColorPicker; -import org.openstreetmap.josm.plugins.rasterfilters.model.FilterStateModel; -import org.openstreetmap.josm.plugins.rasterfilters.model.StateChangeListener; -import org.openstreetmap.josm.plugins.rasterfilters.values.BooleanValue; -import org.openstreetmap.josm.plugins.rasterfilters.values.ColorValue; -import org.openstreetmap.josm.plugins.rasterfilters.values.SelectValue; -import org.openstreetmap.josm.plugins.rasterfilters.values.SliderValue; - -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -23,4 +12,19 @@ import java.util.Set; +import javax.swing.ComboBoxModel; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JSlider; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import com.bric.swing.ColorPicker; +import org.openstreetmap.josm.plugins.rasterfilters.model.FilterStateModel; +import org.openstreetmap.josm.plugins.rasterfilters.model.StateChangeListener; +import org.openstreetmap.josm.plugins.rasterfilters.values.BooleanValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.ColorValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.SelectValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.SliderValue; + /** * This class is GUI listener which tracks all changes of GUI controls @@ -30,5 +34,6 @@ */ public class FilterGuiListener implements ChangeListener, ItemListener, - ActionListener, PropertyChangeListener, FilterStateOwner { + ActionListener, PropertyChangeListener, FilterStateOwner +{ private StateChangeListener handler; @@ -133,6 +138,7 @@ // notify about state is changed now so send msg to FiltersManager - if (handler != null) + if (handler != null) { handler.filterStateChanged(filterId, filterState); + } } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java (revision 33269) @@ -1,18 +1,34 @@ package org.openstreetmap.josm.plugins.rasterfilters.gui; -import com.bric.swing.ColorPicker; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.plugins.rasterfilters.model.FiltersManager; - -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; import java.awt.event.ActionListener; import java.awt.event.ItemListener; import java.rmi.server.UID; import java.util.Hashtable; + +import javax.json.JsonArray; +import javax.json.JsonObject; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JSlider; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; + +import com.bric.swing.ColorPicker; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.plugins.rasterfilters.model.FiltersManager; import static org.openstreetmap.josm.tools.I18n.tr; @@ -230,6 +246,6 @@ Main.debug("Slider is integer\n"); - Main.debug("minValue: " + String.valueOf(minValue) + - "maxValue: " + String.valueOf(maxValue)); + Main.debug("minValue: " + String.valueOf(minValue) + + "maxValue: " + String.valueOf(maxValue)); try { slider = new JSlider(JSlider.HORIZONTAL, minValue, maxValue, @@ -253,6 +269,6 @@ double minValueDouble = array.getJsonNumber(0).doubleValue(); double maxValueDouble = array.getJsonNumber(1).doubleValue(); - Main.debug("DminValue: " + String.valueOf(minValueDouble) + - "DmaxValue: " + String.valueOf(maxValueDouble)); + Main.debug("DminValue: " + String.valueOf(minValueDouble) + + "DmaxValue: " + String.valueOf(maxValueDouble)); int minValue = (int) (minValueDouble * 100); Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterStateOwner.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterStateOwner.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterStateOwner.java (revision 33269) @@ -4,5 +4,5 @@ /** - * Filter state's keeper. This interface is implemented by {@link FilterGuiListeener}. + * Filter state's keeper. This interface is implemented by {@link FilterGuiListener}. * * @author Nipel-Crumple @@ -10,5 +10,5 @@ public interface FilterStateOwner { - public FilterStateModel getState(); + FilterStateModel getState(); } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FiltersDialog.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FiltersDialog.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FiltersDialog.java (revision 33269) @@ -1,12 +1,7 @@ package org.openstreetmap.josm.plugins.rasterfilters.gui; -import org.openstreetmap.josm.gui.layer.ImageryLayer; -import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.plugins.rasterfilters.model.FiltersManager; -import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader; - -import javax.swing.*; -import javax.swing.border.EmptyBorder; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -14,4 +9,20 @@ import java.util.HashSet; import java.util.Set; + +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.border.EmptyBorder; + +import org.openstreetmap.josm.gui.layer.ImageryLayer; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.plugins.rasterfilters.model.FiltersManager; +import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader; /** @@ -71,5 +82,5 @@ } - public JFrame createAndShowGUI() throws MalformedURLException { + public JFrame createAndShowGui() throws MalformedURLException { listModel.removeAllElements(); @@ -167,6 +178,5 @@ } - if (FiltersDownloader.filterTitles.isEmpty() - || listModel.getSize() == 0) { + if (FiltersDownloader.filterTitles.isEmpty() || listModel.getSize() == 0) { addButton.setEnabled(false); filterChooser.setEnabled(false); Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FilterStateModel.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FilterStateModel.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FilterStateModel.java (revision 33269) @@ -1,13 +1,18 @@ package org.openstreetmap.josm.plugins.rasterfilters.model; -import org.openstreetmap.josm.plugins.rasterfilters.values.*; +import java.awt.Color; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; -import java.awt.*; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; + +import org.openstreetmap.josm.plugins.rasterfilters.values.BooleanValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.ColorValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.SelectValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.SliderValue; +import org.openstreetmap.josm.plugins.rasterfilters.values.Value; /** Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java (revision 33269) @@ -1,3 +1,26 @@ package org.openstreetmap.josm.plugins.rasterfilters.model; + +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.image.BufferedImage; +import java.rmi.server.UID; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +import javax.json.JsonArray; +import javax.json.JsonObject; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JSlider; import com.bric.swing.ColorPicker; @@ -10,15 +33,4 @@ import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.image.BufferedImage; -import java.rmi.server.UID; -import java.util.*; /** @@ -28,6 +40,5 @@ * @author Nipel-Crumple */ -public class FiltersManager implements StateChangeListener, ImageProcessor, - ActionListener, ItemListener { +public class FiltersManager implements StateChangeListener, ImageProcessor, ActionListener, ItemListener { public Map filtersMap = new LinkedHashMap<>(); @@ -139,6 +150,7 @@ public void filterStateChanged(UID filterId, FilterStateModel filterState) { - if (filtersMap.get(filterId) != null) + if (filtersMap.get(filterId) != null) { filtersMap.get(filterId).changeFilterState(filterState.encodeJson()); + } if (Main.getLayerManager().getActiveLayer() != null) { Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/StateChangeListener.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/StateChangeListener.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/StateChangeListener.java (revision 33269) @@ -11,5 +11,5 @@ public interface StateChangeListener { - public void filterStateChanged(UID filterId, FilterStateModel filterState); + void filterStateChanged(UID filterId, FilterStateModel filterState); } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java (revision 33269) @@ -1,3 +1,35 @@ package org.openstreetmap.josm.plugins.rasterfilters.preferences; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.StringReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLConnection; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.json.Json; +import javax.json.JsonArray; +import javax.json.JsonObject; +import javax.json.JsonReader; import org.jsoup.Jsoup; @@ -6,18 +38,4 @@ import org.jsoup.select.Elements; import org.openstreetmap.josm.Main; - -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.*; -import java.net.*; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** @@ -103,7 +121,7 @@ String paramName = "rasterfilters." + meta.getString("name"); - + boolean needToLoad = Main.pref.getBoolean(paramName); - + if (needToLoad) { JsonArray binaries = meta.getJsonArray("binaries"); @@ -117,5 +135,5 @@ description, meta, needToLoad); newFilterInfo.setOwner(owner); - + if (!filtersInfoList.contains(newFilterInfo)) { filtersInfoList.add(newFilterInfo); Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java (revision 33269) @@ -1,3 +1,18 @@ package org.openstreetmap.josm.plugins.rasterfilters.preferences; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.util.List; + +import javax.json.JsonObject; +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.border.EmptyBorder; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableModel; import org.openstreetmap.josm.Main; @@ -8,14 +23,4 @@ import org.openstreetmap.josm.tools.GBC; -import javax.json.JsonObject; -import javax.swing.*; -import javax.swing.border.EmptyBorder; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; -import javax.swing.table.AbstractTableModel; -import javax.swing.table.TableModel; -import java.awt.*; -import java.util.List; - /** * This class draws subtab 'Image Filters' in the Preferences menu. @@ -109,5 +114,5 @@ Object[][] data; - public FiltersTableModel() { + FiltersTableModel() { filtersInfoList = FiltersDownloader.downloadFiltersInfoList(); @@ -190,10 +195,5 @@ private String owner; - public FilterInfo() { - - } - - public FilterInfo(String name, String description, JsonObject meta, - boolean needToDownload) { + FilterInfo(String name, String description, JsonObject meta, boolean needToDownload) { this.setName(name); this.setDescription(description); @@ -250,13 +250,6 @@ @Override public boolean equals(Object o) { - if (o instanceof FilterInfo) { - if (name.equals(((FilterInfo) o).getName()) && - meta.equals(((FilterInfo) o).getMeta()) && - description.equals(((FilterInfo) o).getDescription())) { - return true; - } - } - - return false; + return (o instanceof FilterInfo) && name.equals(((FilterInfo) o).getName()) + && meta.equals(((FilterInfo) o).getMeta()) && description.equals(((FilterInfo) o).getDescription()); } } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/BooleanValue.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/BooleanValue.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/BooleanValue.java (revision 33269) @@ -1,4 +1,7 @@ package org.openstreetmap.josm.plugins.rasterfilters.values; +/** + * @author Nipel-Crumple + */ public class BooleanValue implements Value { Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/ColorValue.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/ColorValue.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/ColorValue.java (revision 33269) @@ -1,4 +1,7 @@ package org.openstreetmap.josm.plugins.rasterfilters.values; +/** + * @author Nipel-Crumple + */ public class ColorValue implements Value { Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SelectValue.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SelectValue.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SelectValue.java (revision 33269) @@ -1,4 +1,7 @@ package org.openstreetmap.josm.plugins.rasterfilters.values; +/** + * @author Nipel-Crumple + */ public class SelectValue implements Value { Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SliderValue.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SliderValue.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SliderValue.java (revision 33269) @@ -1,4 +1,7 @@ package org.openstreetmap.josm.plugins.rasterfilters.values; +/** + * @author Nipel-Crumple + */ public class SliderValue implements Value { @@ -29,11 +32,8 @@ public void setParameterName(String name) { this.parameterName = name; - ; } public boolean isDouble() { - if (value instanceof Double) - return true; - return false; + return value instanceof Double; } } Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/Value.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/Value.java (revision 33268) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/Value.java (revision 33269) @@ -9,12 +9,12 @@ * @author Nipel-Crumple */ -public interface Value { +public interface Value { - public T getValue(); + T getValue(); - public void setValue(T value); + void setValue(T value); - public String getParameterName(); + String getParameterName(); - public void setParameterName(String name); + void setParameterName(String name); }