Ignore:
Timestamp:
2016-07-05T00:21:50+02:00 (9 years ago)
Author:
donvip
Message:

checkstyle

Location:
applications/editors/josm/plugins/czechaddress
Files:
2 added
59 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/czechaddress/.classpath

    r30416 r32566  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<classpath>
    3         <classpathentry excluding="src/" including="images/**" kind="src" path=""/>
    43        <classpathentry kind="src" path="src"/>
    54        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

  • applications/editors/josm/plugins/czechaddress/.project

    r32286 r32566  
    1616                        </arguments>
    1717                </buildCommand>
     18                <buildCommand>
     19                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
     20                        <arguments>
     21                        </arguments>
     22                </buildCommand>
    1823        </buildSpec>
    1924        <natures>
    2025                <nature>org.eclipse.jdt.core.javanature</nature>
     26                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
    2127        </natures>
    2228</projectDescription>

  • applications/editors/josm/plugins/czechaddress/build.xml

    r32453 r32566  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="10279"/>
     7    <property name="plugin.main.version" value="10420"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23
    … …  
    9394
    9495        if (!GraphicsEnvironment.isHeadless()) {
    95                 ConflictResolver.getInstance();
     96            ConflictResolver.getInstance();
    9697        }
    9798        SelectionMonitor.getInstance();
    … …  
    120121                            "Selhalo načtení databáze. Plugin je neaktivní.");
    121122            }
    122         }};
     123        } };
    123124
    124125        t.setPriority(Thread.MIN_PRIORITY);
    … …  
    136137    }
    137138
    138     static public void initReasoner() {
     139    public static void initReasoner() {
    139140        Reasoner reasoner = Reasoner.getInstance();
    140141
    141         synchronized(reasoner) {
     142        synchronized (reasoner) {
    142143            reasoner.reset();
    143144            reasoner.openTransaction();
    144             for (House house : location.getAllHouses())
     145            for (House house : location.getAllHouses()) {
    145146                reasoner.update(house);
    146 
    147             for (Street street : location.getAllStreets())
     147            }
     148
     149            for (Street street : location.getAllStreets()) {
    148150                reasoner.update(street);
     151            }
    149152
    150153            DataSet dataSet = Main.getLayerManager().getEditDataSet();
    … …  
    162165    }
    163166
    164     static private ElementWithStreets location = null;
    165     static public  ElementWithStreets getLocation() {
     167    private static ElementWithStreets location = null;
     168
     169    public static ElementWithStreets getLocation() {
    166170        if (location == null)
    167171            changeLocation();
    … …  
    169173    }
    170174
    171     static public void changeLocation() {
     175    public static void changeLocation() {
    172176        ElementWithStreets newLocation = LocationSelector.selectLocation();
    173177
    … …  
    178182    }
    179183
    180     static private final Set<StatusListener> listeners = new HashSet<>();
    181     static public synchronized void addStatusListener(StatusListener l)    {listeners.add(l);}
    182     static public synchronized void removeStatusListener(StatusListener l) {listeners.remove(l);}
    183     static public synchronized void broadcastStatusChange(int statusMessage) {
    184         for (StatusListener listener : listeners)
     184    private static final Set<StatusListener> listeners = new HashSet<>();
     185
     186    public static synchronized void addStatusListener(StatusListener l) {
     187        listeners.add(l);
     188    }
     189
     190    public static synchronized void removeStatusListener(StatusListener l) {
     191        listeners.remove(l);
     192    }
     193
     194    public static synchronized void broadcastStatusChange(int statusMessage) {
     195        for (StatusListener listener : listeners) {
    185196            listener.pluginStatusChanged(statusMessage);
    186     }
    187 
     197        }
     198    }
     199
     200    @Override
    188201    public void pluginStatusChanged(int message) {
    189202        if (message == MESSAGE_DATABASE_LOADED) {
    190203            GuiHelper.runInEDTAndWait(new Runnable() {
    191204                @Override public void run() {
    192                     czechMenu = Main.main.menu.addMenu("Address", tr("Address"), KeyEvent.VK_Z, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/CzechAddress"));
     205                    czechMenu = Main.main.menu.addMenu("Address", tr("Address"), KeyEvent.VK_Z,
     206                            Main.main.menu.getDefaultMenuPos(), ht("/Plugin/CzechAddress"));
    193207                    menuItems.add(MainMenu.add(czechMenu, new PointManipulatorAction()));
    194208                    menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction()));

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/DatabaseLoadException.java

    r30864 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java

    r30532 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23
    … …  
    2223 * @author radek
    2324 */
    24 public class Preferences extends DefaultTabPreferenceSetting {
     25public final class Preferences extends DefaultTabPreferenceSetting {
    2526
    2627    public JPanel thisPanel;
    … …  
    5657        thisPanel = new JPanel();
    5758        initComponents();
    58         addBuildingTag = Main.pref.getBoolean(KEY_BUILDINGTAG,    buildingCheckBox.isSelected());
    59         addNewTag      = Main.pref.getBoolean(KEY_ADDNEWTAG,      addNewTagCheckBox.isSelected());
    60         addNewTagKey   = Main.pref.get(       KEY_ADDNEWTAGKEY,  addNewTagKeyField.getText());
    61         addNewTagValue = Main.pref.get(       KEY_ADDNEWTAGVALUE, addNewTagValueField.getText());
    62         optimize       = Main.pref.getInteger(KEY_OPTIMIZE,      optimizeComboBox.getSelectedIndex());
     59        addBuildingTag = Main.pref.getBoolean(KEY_BUILDINGTAG, buildingCheckBox.isSelected());
     60        addNewTag = Main.pref.getBoolean(KEY_ADDNEWTAG, addNewTagCheckBox.isSelected());
     61        addNewTagKey = Main.pref.get(KEY_ADDNEWTAGKEY, addNewTagKeyField.getText());
     62        addNewTagValue = Main.pref.get(KEY_ADDNEWTAGVALUE, addNewTagValueField.getText());
     63        optimize = Main.pref.getInteger(KEY_OPTIMIZE, optimizeComboBox.getSelectedIndex());
    6364    }
    6465
    … …  
    9495        addNewTagCheckBox.setText("Novým primitivám přidávat tag:");
    9596        addNewTagCheckBox.addChangeListener(new ChangeListener() {
     97            @Override
    9698            public void stateChanged(ChangeEvent evt) {
    9799                addNewTagChanged(evt);
    … …  
    99101        });
    100102        addNewTagCheckBox.addActionListener(new ActionListener() {
     103            @Override
    101104            public void actionPerformed(ActionEvent evt) {
    102105                addNewTagCheckBoxActionPerformed(evt);
    … …  
    114117        jLabel2.setText("Optimalizovat algoritmus přiřazování:");
    115118
    116         optimizeComboBox.setModel(new DefaultComboBoxModel<>(new String[] { "pro rychlejší odezvu", "menší spotřebu paměti" }));
     119        optimizeComboBox.setModel(new DefaultComboBoxModel<>(new String[] {"pro rychlejší odezvu", "menší spotřebu paměti"}));
    117120        optimizeComboBox.setSelectedIndex(1);
    118121        optimizeComboBox.setEnabled(false);
    … …  
    120123        buildingCheckBox.setText("Nově polygonům přidávat tag \"building=yes\"");
    121124        buildingCheckBox.addChangeListener(new ChangeListener() {
     125            @Override
    122126            public void stateChanged(ChangeEvent evt) {
    123127                buildingCheckBoxaddNewTagChanged(evt);
    … …  
    125129        });
    126130        buildingCheckBox.addActionListener(new java.awt.event.ActionListener() {
     131            @Override
    127132            public void actionPerformed(java.awt.event.ActionEvent evt) {
    128133                buildingCheckBoxActionPerformed(evt);
    … …  
    171176
    172177        thisPanel.add(mainPanel);
    173     }// </editor-fold>//GEN-END:initComponents
    174 
    175     private void addNewTagChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_addNewTagChanged
     178    } // </editor-fold>//GEN-END:initComponents
     179
     180    private void addNewTagChanged(javax.swing.event.ChangeEvent evt) { //GEN-FIRST:event_addNewTagChanged
    176181        addNewTagKeyField.setEnabled(addNewTagCheckBox.isSelected());
    177182        addNewTagValueField.setEnabled(addNewTagCheckBox.isSelected());
    178     }//GEN-LAST:event_addNewTagChanged
    179 
    180     private void addNewTagCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addNewTagCheckBoxActionPerformed
    181 
    182     }//GEN-LAST:event_addNewTagCheckBoxActionPerformed
    183 
    184     private void buildingCheckBoxaddNewTagChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_buildingCheckBoxaddNewTagChanged
    185 
    186     }//GEN-LAST:event_buildingCheckBoxaddNewTagChanged
    187 
    188     private void buildingCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buildingCheckBoxActionPerformed
    189 
    190     }//GEN-LAST:event_buildingCheckBoxActionPerformed
    191 
     183    } //GEN-LAST:event_addNewTagChanged
     184
     185    private void addNewTagCheckBoxActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_addNewTagCheckBoxActionPerformed
     186
     187    } //GEN-LAST:event_addNewTagCheckBoxActionPerformed
     188
     189    private void buildingCheckBoxaddNewTagChanged(javax.swing.event.ChangeEvent evt) { //GEN-FIRST:event_buildingCheckBoxaddNewTagChanged
     190
     191    } //GEN-LAST:event_buildingCheckBoxaddNewTagChanged
     192
     193    private void buildingCheckBoxActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_buildingCheckBoxActionPerformed
     194
     195    } //GEN-LAST:event_buildingCheckBoxActionPerformed
     196
     197    @Override
    192198    public void addGui(PreferenceTabbedPane gui) {
    193199        JPanel p = gui.createPreferenceTab(this);
    … …  
    196202    }
    197203
     204    @Override
    198205    public boolean ok() {
    199206        addBuildingTag = buildingCheckBox.isSelected();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23
    34import java.util.Comparator;
     5
    46import org.openstreetmap.josm.data.osm.OsmPrimitive;
    57
    … …  
    3335    public static final Comparator<OsmPrimitive> comparator =
    3436        new Comparator<OsmPrimitive>() {
     37        @Override
    3538        public int compare(OsmPrimitive o1, OsmPrimitive o2) {
    3639

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23
    … …  
    2021 * {@code removeStatusListener()}.
    2122 *
     23 * @author Radomír Černoch, radomir.cernoch@gmail.com
    2224 * @see CzechAddressPlugin
    23  *
    24  * @author Radomír Černoch, radomir.cernoch@gmail.com
    2525 */
    2626public interface StatusListener {
    … …  
    3434     * @see AddressElement
    3535     */
    36     static final int MESSAGE_LOCATION_CHANGED  = 1;
     36    int MESSAGE_LOCATION_CHANGED = 1;
    3737
    3838    /**
    … …  
    4545     * @see Database
    4646     */
    47     static final int MESSAGE_DATABASE_LOADED  = 2;
     47    int MESSAGE_DATABASE_LOADED = 2;
    4848
    4949    /**

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress;
    23
    … …  
    45import java.util.ArrayList;
    56import java.util.List;
     7
    68import org.openstreetmap.josm.data.coor.LatLon;
    79
    … …  
    2527    public static String extractNumber(String s) {
    2628        String result = "";
    27         for (int i=0; i<s.length(); i++) {
     29        for (int i = 0; i < s.length(); i++) {
    2830            char ch = s.charAt(i);
    2931            if (ch >= '0' && ch <= '9')
    … …  
    3739    public static String coordinateToString(double coor) {
    3840        double degrees = Math.floor(coor);
    39         double minutes = Math.floor( 60*(coor-degrees) );
     41        double minutes = Math.floor(60*(coor-degrees));
    4042        double seconds = 60*60*(coor-degrees-minutes/60);
    4143
    42         return String.valueOf(Math.round(    degrees))    + "°" +
    43                String.valueOf(Math.round(    minutes))    + "'" +
    44                String.valueOf(Math.round(100*seconds)/100.0) + "\"";
     44        return String.valueOf(Math.round(degrees)) + "°" +
     45        String.valueOf(Math.round(minutes)) + "'" +
     46        String.valueOf(Math.round(100*seconds)/100.0) + "\"";
    4547    }
    4648
    … …  
    4951
    5052        return "(lat: " + coordinateToString(position.lat())
    51              + " lon: " + coordinateToString(position.lon()) + ")";
     53        + " lon: " + coordinateToString(position.lon()) + ")";
    5254    }
    5355
    … …  
    6769
    6870        char lastChar = ' ';
    69         for (int i=0; i<s1.length(); i++) {
     71        for (int i = 0; i < s1.length(); i++) {
    7072            if (s1.charAt(i) != ' ' && lastChar == ' ')
    7173                beg1.add(i);
    … …  
    7476
    7577        lastChar = ' ';
    76         for (int i=0; i<s2.length(); i++) {
     78        for (int i = 0; i < s2.length(); i++) {
    7779            if (s2.charAt(i) != ' ' && lastChar == ' ')
    7880                beg2.add(i);
    … …  
    8385            return false;
    8486
    85         for (int i=0; i<beg1.size(); i++) {
     87        for (int i = 0; i < beg1.size(); i++) {
    8688
    8789            int pos1 = beg1.get(i);
    … …  
    9092            boolean doContinue = false;
    9193            while (pos1 < s1.length() && pos2 < s2.length()) {
    92                 if (s1.charAt(pos1) == '.' || s2.charAt(pos2) == '.')
    93                     {doContinue = true; break;}
    94                 if (s1.charAt(pos1) == ' ' && s2.charAt(pos2) == ' ')
    95                      {doContinue = true; break;}
     94                if (s1.charAt(pos1) == '.' || s2.charAt(pos2) == '.') {
     95                    doContinue = true; break;
     96                }
     97                if (s1.charAt(pos1) == ' ' && s2.charAt(pos2) == ' ') {
     98                    doContinue = true; break;
     99                }
    96100
    97                 if (Character.toUpperCase(s1.charAt(pos1)) !=
    98                     Character.toUpperCase(s2.charAt(pos2)))
     101                if (Character.toUpperCase(s1.charAt(pos1)) != Character.toUpperCase(s2.charAt(pos2)))
    99102                    return false;
    100103
    … …  
    129132        char last = ' ';
    130133        char ch = last;
    131         for (int i=0; i<charr.length; i++) {
     134        for (int i = 0; i < charr.length; i++) {
    132135            ch = charr[i];
    133136            if ((last >= 'a') && (last <= 'ž') ||
    134                 (last >= 'A') && (last <= 'Ž'))
     137                    (last >= 'A') && (last <= 'Ž'))
    135138                ch = Character.toLowerCase(ch);
    136139            else
    … …  
    142145
    143146        result = result.replaceAll("Nábř. ", "nábřeží ");
    144         result = result.replaceAll("Ul. ",   "ulice ");
    145         result = result.replaceAll("Nám. ",  "náměstí ");
    146         result = result.replaceAll("Kpt. ",  "kapitána ");
    147         result = result.replaceAll("Bří. ",  "bratří ");
     147        result = result.replaceAll("Ul. ", "ulice ");
     148        result = result.replaceAll("Nám. ", "náměstí ");
     149        result = result.replaceAll("Kpt. ", "kapitána ");
     150        result = result.replaceAll("Bří. ", "bratří ");
    148151
    149         String[] noCapitalize = { "Nad", "Pod", "U", "Na", "Z" };
    150         for (String noc : noCapitalize)
     152        String[] noCapitalize = {"Nad", "Pod", "U", "Na", "Z"};
     153        for (String noc : noCapitalize) {
    151154            result = result.replaceAll(" "+noc+" ", " "+noc.toLowerCase()+" ");
    152 
     155        }
    153156
    154157        String[] mesice = {"Ledna", "Února", "Března", "Dubna", "Května",
    155             "Máje", "Června", "Července", "Srpna", "Září", "Října",
    156             "Listopadu", "Prosince"};
    157         for (String mesic : mesice)
     158                "Máje", "Června", "Července", "Srpna", "Září", "Října",
     159                "Listopadu", "Prosince"};
     160        for (String mesic : mesice) {
    158161            result = result.replaceAll("."+mesic, ". " + mesic.toLowerCase());
    159 
     162        }
    160163
    161164        String[] noBegCap = {"Třída", "Ulice", "Náměstí", "Nábřeží"};
    162         for (String noc : noBegCap)
     165        for (String noc : noBegCap) {
    163166            result = result.replaceAll(noc, noc.toLowerCase());
     167        }
    164168
    165169        return result.replaceAll("  ", " ");

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java

    r29727 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    1213 * Action, which shows the dialog for resolving conflicts.
    1314 *
     15 * @author Radomír Černoch, radomir.cernoch@gmail.com
    1416 * @see ConflictResolver
    15  *
    16  * @author Radomír Černoch, radomir.cernoch@gmail.com
    1717 */
    1818public class ConflictResolveAction extends JosmAction {
    … …  
    3939     * from {@link CzechAddressPlugin}{@code .conflictResolver}.
    4040     */
     41    @Override
    4142    public void actionPerformed(ActionEvent e) {
    4243        ConflictResolver.getInstance().showDialog();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    2526 * on the map.</p>
    2627 *
     28 * @author Radomír Černoch, radomir.cernoch@gmail.com
    2729 * @see FactoryDialog
    28  *
    29  * @author Radomír Černoch, radomir.cernoch@gmail.com
    3030 */
    3131public class FactoryAction extends MapMode {
    … …  
    3838              "envelope-cursor.png",
    3939              "Vytváří adresní body jedním kliknutím",
    40               Shortcut.registerShortcut( "mapmode:clickaddress",
     40              Shortcut.registerShortcut("mapmode:clickaddress",
    4141                  "Sputit továrnu na adresy",
    4242                  KeyEvent.VK_K, Shortcut.ALT_SHIFT),
    … …  
    9999
    100100        Reasoner r = Reasoner.getInstance();
    101         synchronized(r) {
     101        synchronized (r) {
    102102            r.openTransaction();
    103103            r.doOverwrite(newNode, house);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java

    r29727 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    1213 * Action adding a menu item for doing address completion.
    1314 *
     15 * @author Radomír Černoch radomir.cernoch@gmail.com
    1416 * @see GroupManipulatorDialog
    15  *
    16  * @author Radomír Černoch radomir.cernoch@gmail.com
    1717 */
    1818public class GroupManipulatorAction extends JosmAction {
    … …  
    3838     * {@code null}. If so, nothing happens.</p>
    3939     */
     40    @Override
    4041    public void actionPerformed(ActionEvent e) {
    4142        if (CzechAddressPlugin.getLocation() == null) return;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/HelpAction.java

    r15201 r32566  
    1 /*
    2  * To change this template, choose Tools | Templates
    3  * and open the template in the editor.
    4  */
    5 
     1// License: GPL. For details, see LICENSE file.
    62package org.openstreetmap.josm.plugins.czechaddress.actions;
    73
    84import java.awt.event.ActionEvent;
     5
    96import org.openstreetmap.josm.actions.JosmAction;
    107import org.openstreetmap.josm.tools.OpenBrowser;
    … …  
    2421    }
    2522
     23    @Override
    2624    public void actionPerformed(ActionEvent e) {
    2725        OpenBrowser.displayUrl("http://wiki.openstreetmap.org/wiki/Cz:JOSM/Plugins/CzechAddress");

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java

    r30346 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    1718    public ManagerAction() {
    1819        super("Upravit databázi",
    19               (String)null,//"envelope-closed-big.png",
     20              (String) null, //"envelope-closed-big.png",
    2021              "Upravit jména elemntů dle mapy",
    2122              null,

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    1516 * Action adding a menu item for editing address points
    1617 *
     18 * @author Radomír Černoch radomir.cernoch@gmail.com
    1719 * @see PointManipulatorDialog
    18  *
    19  * @author Radomír Černoch radomir.cernoch@gmail.com
    2020 */
    2121public class PointManipulatorAction extends JosmAction {
    … …  
    4242     * selected. If both conditions are satisfied, dialog is opened.</p>
    4343     */
     44    @Override
    4445    public void actionPerformed(ActionEvent e) {
    4546        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.actions;
    23
    … …  
    5354     * area.
    5455     */
     56    @Override
    5557    public void actionPerformed(ActionEvent e) {
    5658        DataSet ds = Main.getLayerManager().getEditDataSet();
    … …  
    5961
    6062        for (Way area : selectedWays) {
    61             if (! area.isClosed()) continue;
     63            if (!area.isClosed()) continue;
    6264
    6365            for (OsmPrimitive prim2 : ds.allNonDeletedPrimitives()) {
    6466                if (!(prim2 instanceof Way)) continue;
    65                 if (prim2.equals(area))      continue;
     67                if (prim2.equals(area)) continue;
    6668                Way border = (Way) prim2;
    67                 if (border.getNodes().isEmpty())   continue;
     69                if (border.getNodes().isEmpty()) continue;
    6870                if (border.keySet().size() > 0) continue;
    6971                if (!area.getNodes().contains(border.firstNode())) continue;
    70                 if (!area.getNodes().contains(border.lastNode()))  continue;
     72                if (!area.getNodes().contains(border.lastNode())) continue;
    7173
    7274                Way newArea1 = new Way();
    … …  
    110112     * @param newArea1 reference to the first new area
    111113     * @param newArea2 reference to the second new area
    112      * @return
    113114     */
    114115    private int splitArea(Way area, Way border, Way newArea1, Way newArea2) {
    115116
    116         for (Relation r : Main.getLayerManager().getEditDataSet().getRelations())
    117             for (RelationMember rm : r.getMembers())
     117        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations()) {
     118            for (RelationMember rm : r.getMembers()) {
    118119                if (rm.refersTo(area) || rm.refersTo(border))
    119120                    return 2;
     121            }
     122        }
    120123
    121124        List<Node> bordNodes = border.getNodes();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
    34import java.util.List;
     5
    46import org.openstreetmap.josm.data.osm.Node;
    57import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    2527     * Constructor setting the name of this element.
    2628     */
    27     public AddressElement (String name) {
     29    public AddressElement(String name) {
    2830        if (name == null)
    2931            throw new NullPointerException("You must specify the name of this AddressElement");
    … …  
    5052    }
    5153
    52 
    5354    public static String getName(Object o) {
    5455        if (o instanceof OsmPrimitive)
    … …  
    6263
    6364    public static String getName(OsmPrimitive prim) {
     65        // CHECKSTYLE.OFF: SingleSpaceSeparator
    6466        String cp     = prim.get(PrimUtils.KEY_ADDR_CP);
    6567        String co     = prim.get(PrimUtils.KEY_ADDR_CO);
    … …  
    6769        String city   = prim.get(PrimUtils.KEY_ADDR_CITY);
    6870        String name   = prim.get(PrimUtils.KEY_NAME);
     71        // CHECKSTYLE.ON: SingleSpaceSeparator
    6972
    7073        String result = "";
    … …  
    137140     *
    138141     * <p>Basic criterion to comparing elements is their <i>name</i> and the
    139      * </i>parent</i>. Notice that this behaviour might be changed
     142     * <i>parent</i>. Notice that this behaviour might be changed
    140143     * in subclasses.</p>
    141144     *
    … …  
    211214    public static int matchFieldAbbrev(String elemValue, String primValue) {
    212215
    213         if (elemValue == null) return  0;
     216        if (elemValue == null) return 0;
    214217        if (primValue == null) return -1;
    215218
    216219        return StringUtils.matchAbbrev(primValue, elemValue) ? 1 : -1;
    217220    }
    218 
    219221
    220222    protected int[] getFieldMatchList(OsmPrimitive primitive) {
    … …  
    250252        int minVal = fieldMatches[0];
    251253        int maxVal = fieldMatches[0];
    252         for (int i=1; i<fieldMatches.length; i++) {
     254        for (int i = 1; i < fieldMatches.length; i++) {
    253255            if (minVal > fieldMatches[i])
    254256                minVal = fieldMatches[i];
    … …  
    278280    }
    279281
     282    @Override
    280283    public int compareTo(AddressElement elem) {
    281284
    … …  
    286289        if (retVal != 0) return retVal;
    287290
    288         return toString().compareTo(((AddressElement) elem).toString());
     291        return toString().compareTo(elem.toString());
    289292    }
    290293}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
    34import java.util.ArrayList;
     5
    46import org.openstreetmap.josm.plugins.czechaddress.parser.DatabaseParser;
    57
    … …  
    1012 * and houses in the Czech republic.</p>
    1113 *
     14 * @author Radomír Černoch radomir.cernoch@gmail.com
    1215 * @see AddressElement
    1316 * @see DatabaseParser
    14 
    15  * @author Radomír Černoch radomir.cernoch@gmail.com
    1617 */
    17 public class Database {
     18public final class Database {
    1819
    1920    private Database() {}
     21
    2022    private static Database singleton = null;
    21     public  static Database getInstance() {
     23
     24    public static Database getInstance() {
    2225        if (singleton == null)
    2326            singleton = new Database();
    … …  
    4447                continue;
    4548
    46             if ( region.getNuts3Name() != null &&
     49            if (region.getNuts3Name() != null &&
    4750                !region.getNuts3Name().toUpperCase().equals(nuts3))
    4851                continue;
    4952
    50             if ( region.getNuts4Name() != null &&
     53            if (region.getNuts4Name() != null &&
    5154                !region.getNuts4Name().toUpperCase().equals(nuts3))
    5255                continue;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
    … …  
    3334     */
    3435    public void addStreets(Collection<Street> streetsToAdd) {
    35         streets.ensureCapacity(streets.size() + streetsToAdd.size() );
    36         for (Street streetToAdd : streetsToAdd)
     36        streets.ensureCapacity(streets.size() + streetsToAdd.size());
     37        for (Street streetToAdd : streetsToAdd) {
    3738            addStreet(streetToAdd);
     39        }
    3840    }
    3941
    … …  
    5961    }
    6062
    61 
    6263    public Street findStreet(String streetName) {
    6364
    … …  
    6667        streetName = streetName.toUpperCase();
    6768
    68         for (Street street : streets)
     69        for (Street street : streets) {
    6970            if (street.getName().toUpperCase().equals(streetName))
    7071                return street;
     72        }
    7173        return null;
    7274    }
    … …  
    8284        result.addAll(this.houses);
    8385
    84         for (Street street : streets)
     86        for (Street street : streets) {
    8587            result.addAll(street.getHouses());
     88        }
    8689
    8790        return result;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
     4import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getListFieldDiff;
     5import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
     6
    37import java.util.List;
     8
    49import org.openstreetmap.josm.data.osm.OsmPrimitive;
    510import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
    611import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
    712import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
    8 
    9 import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
    10 import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getListFieldDiff;
    1113
    1214/**
    … …  
    158160        // First field is the AlternateNubmer
    159161        result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP));
    160         result[2] = matchField(name,    prim.get(PrimUtils.KEY_ADDR_HOUSE_N));
     162        result[2] = matchField(name, prim.get(PrimUtils.KEY_ADDR_HOUSE_N));
    161163
    162164        // Second field is the Housenumber
    … …  
    164166            result[1] = Math.min(
    165167                matchFieldAbbrev(parent.getName(), prim.get(PrimUtils.KEY_ADDR_STREET)),
    166                 matchField(      this.co,          prim.get(PrimUtils.KEY_ADDR_CO)) );
     168                matchField(this.co, prim.get(PrimUtils.KEY_ADDR_CO)));
    167169        return result;
    168170    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java

    r15585 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
    … …  
    6263    }
    6364
     65    @Override
    6466    public int compareTo(ParentResolver o) {
    6567        int val = 0;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
    … …  
    5657    /**
    5758     * Default constructor setting the name of this region.
    58      * @param name
    5959     */
    6060    public Region(String name) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
     4import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
     5
    36import java.util.List;
     7
    48import org.openstreetmap.josm.data.osm.OsmPrimitive;
    59import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
    610import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
    711import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
    8 
    9 import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
    1012
    1113/**

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
    23
     4import java.util.ArrayList;
    35import java.util.List;
    4 import java.util.ArrayList;
    56
    67/**

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
     4import java.awt.event.ActionEvent;
     5import java.awt.event.ActionListener;
    36import java.util.ArrayList;
    47import java.util.Collections;
    … …  
    1114import javax.swing.ComboBoxModel;
    1215import javax.swing.DefaultComboBoxModel;
     16import javax.swing.GroupLayout;
    1317import javax.swing.Icon;
    1418import javax.swing.JButton;
     19import javax.swing.LayoutStyle;
    1520import javax.swing.event.ListDataEvent;
    1621import javax.swing.event.ListDataListener;
    … …  
    3540 * @author Radomír Černoch, radomir.cernoch@gmail.com
    3641 */
    37 public class ConflictResolver extends ExtendedDialog {
     42public final class ConflictResolver extends ExtendedDialog {
    3843
    3944    private static ConflictResolver singleton = null;
    … …  
    98103        candZoomButton.setEnabled(false);
    99104        candZoomButton.addActionListener(new java.awt.event.ActionListener() {
     105            @Override
    100106            public void actionPerformed(java.awt.event.ActionEvent evt) {
    101107                candZoomButtonActionPerformed(evt);
    … …  
    108114        reassignButton.setEnabled(false);
    109115        reassignButton.addActionListener(new java.awt.event.ActionListener() {
     116            @Override
    110117            public void actionPerformed(java.awt.event.ActionEvent evt) {
    111118                reassignButtonActionPerformed(evt);
    … …  
    118125        mainZoomButton.setEnabled(false);
    119126        mainZoomButton.addActionListener(new java.awt.event.ActionListener() {
     127            @Override
    120128            public void actionPerformed(java.awt.event.ActionEvent evt) {
    121129                mainZoomButtonActionPerformed(evt);
    … …  
    123131        });
    124132
    125         mainField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
     133        mainField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] {"Item 1", "Item 2", "Item 3", "Item 4"}));
    126134        mainField.setRenderer(new UniversalListRenderer());
    127135
    128         candField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] { " " }));
     136        candField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] {" "}));
    129137        candField.setRenderer(new UniversalListRenderer());
    130138
    … …  
    132140        candPickButton.setEnabled(false);
    133141        candPickButton.addActionListener(new java.awt.event.ActionListener() {
     142            @Override
    134143            public void actionPerformed(java.awt.event.ActionEvent evt) {
    135144                candPickButtonActionPerformed(evt);
    … …  
    139148        mainPickButton.setText("     ");
    140149        mainPickButton.setEnabled(false);
    141         mainPickButton.addActionListener(new java.awt.event.ActionListener() {
    142             public void actionPerformed(java.awt.event.ActionEvent evt) {
     150        mainPickButton.addActionListener(new ActionListener() {
     151            @Override
     152            public void actionPerformed(ActionEvent evt) {
    143153                mainPickButtonActionPerformed(evt);
    144154            }
    145155        });
    146156
    147         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
     157        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    148158        mainPanel.setLayout(mainPanelLayout);
    149159        mainPanelLayout.setHorizontalGroup(
    150             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    151             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
    152                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     160            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     161            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
     162                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    153163                    .addComponent(candLabel)
    154164                    .addComponent(mainLabel))
    155165                .addGap(6, 6, 6)
    156                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    157                     .addComponent(candField, javax.swing.GroupLayout.Alignment.TRAILING, 0, 430, Short.MAX_VALUE)
     166                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     167                    .addComponent(candField, GroupLayout.Alignment.TRAILING, 0, 430, Short.MAX_VALUE)
    158168                    .addComponent(mainField, 0, 430, Short.MAX_VALUE))
    159169                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    160                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
     170                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
    161171                    .addComponent(candZoomButton)
    162172                    .addComponent(mainZoomButton))
    163173                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    164                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     174                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    165175                    .addComponent(mainPickButton)
    166176                    .addComponent(candPickButton)))
    167             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
     177            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
    168178                .addContainerGap()
    169179                .addComponent(reassignButton))
    170180        );
    171181        mainPanelLayout.setVerticalGroup(
    172             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     182            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    173183            .addGroup(mainPanelLayout.createSequentialGroup()
    174                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    175                     .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    176                         .addComponent(mainField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     184                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     185                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     186                        .addComponent(mainField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    177187                        .addComponent(mainLabel))
    178188                    .addGroup(mainPanelLayout.createSequentialGroup()
    179                         .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     189                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    180190                            .addComponent(mainZoomButton)
    181191                            .addComponent(mainPickButton))
    182192                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    183                         .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     193                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    184194                            .addComponent(candPickButton)
    185195                            .addComponent(candZoomButton)
    186                             .addComponent(candField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     196                            .addComponent(candField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    187197                            .addComponent(candLabel))))
    188                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
     198                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
    189199                .addComponent(reassignButton))
    190200        );
    … …  
    193203
    194204        pack();
    195     }// </editor-fold>//GEN-END:initComponents
    196 
    197     private void mainZoomButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mainZoomButtonActionPerformed
     205    } // </editor-fold>//GEN-END:initComponents
     206
     207    private void mainZoomButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_mainZoomButtonActionPerformed
    198208        zoomTo(mainField.getSelectedItem());
    199     }//GEN-LAST:event_mainZoomButtonActionPerformed
    200 
    201     private void candZoomButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_candZoomButtonActionPerformed
     209    } //GEN-LAST:event_mainZoomButtonActionPerformed
     210
     211    private void candZoomButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_candZoomButtonActionPerformed
    202212        zoomTo(candField.getSelectedItem());
    203     }//GEN-LAST:event_candZoomButtonActionPerformed
     213    } //GEN-LAST:event_candZoomButtonActionPerformed
    204214
    205215    private void zoomTo(Object item) {
    … …  
    223233    }
    224234
    225     private void reassignButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reassignButtonActionPerformed
     235    private void reassignButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_reassignButtonActionPerformed
    226236
    227237        Reasoner r = Reasoner.getInstance();
    … …  
    266276            r.closeTransaction();
    267277        }
    268     }//GEN-LAST:event_reassignButtonActionPerformed
    269 
    270     private void mainPickButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mainPickButtonActionPerformed
     278    } //GEN-LAST:event_reassignButtonActionPerformed
     279
     280    private void mainPickButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_mainPickButtonActionPerformed
    271281        if (mainField.getSelectedItem() instanceof House)
    272282            FactoryDialog.getInstance().setSelectedHouse((House) mainField.getSelectedItem());
    273     }//GEN-LAST:event_mainPickButtonActionPerformed
    274 
    275     private void candPickButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_candPickButtonActionPerformed
     283    } //GEN-LAST:event_mainPickButtonActionPerformed
     284
     285    private void candPickButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_candPickButtonActionPerformed
    276286        if (candField.getSelectedItem() instanceof House)
    277287            FactoryDialog.getInstance().setSelectedHouse((House) candField.getSelectedItem());
    278     }//GEN-LAST:event_candPickButtonActionPerformed
     288    } //GEN-LAST:event_candPickButtonActionPerformed
    279289
    280290    // Variables declaration - do not modify//GEN-BEGIN:variables
    … …  
    298308    private class ReasonerHook implements ReasonerListener {
    299309
     310        @Override
    300311        public void elementChanged(AddressElement elem) {
    301312            if (!(elem instanceof House)) return;
    … …  
    308319        }
    309320
     321        @Override
    310322        public void primitiveChanged(OsmPrimitive prim) {
    311323            if (!House.isMatchable(prim)) return;
    … …  
    318330        }
    319331
     332        @Override
    320333        public void resonerReseted() {
    321334        }
    … …  
    425438        }
    426439*/
     440        @Override
    427441        public void setSelectedItem(Object anItem) {
    428442
    … …  
    437451        }
    438452
     453        @Override
    439454        public Object getSelectedItem() {
    440455            return selected;
    441456        }
    442457
     458        @Override
    443459        public int getSize() {
    444460            return primitives.size() + elements.size();
    445461        }
    446462
     463        @Override
    447464        public Object getElementAt(int index) {
    448             if (index< elements.size())
     465            if (index < elements.size())
    449466                return elements.get(index);
    450467
    451468            index -= elements.size();
    452469
    453             if (index< primitives.size())
     470            if (index < primitives.size())
    454471                return primitives.get(index);
    455472
    … …  
    457474        }
    458475
     476        @Override
    459477        public void addListDataListener(ListDataListener l) {
    460478            listeners.add(l);
    461479        }
    462480
     481        @Override
    463482        public void removeListDataListener(ListDataListener l) {
    464483            listeners.remove(l);
    … …  
    518537        Object selected = null;
    519538
    520         public CandidatesModel(List<? extends E> data) {
     539        CandidatesModel(List<? extends E> data) {
    521540            primitives = data;
    522541        }
    523542
     543        @Override
    524544        public void setSelectedItem(Object anItem) {
    525545            selected = anItem;
    … …  
    528548
    529549            if (conflictModel.getSelectedItem() instanceof AddressElement) {
    530                 reassignButton.setEnabled( selected !=
     550                reassignButton.setEnabled(selected !=
    531551                        Reasoner.getInstance().getStrictlyBest(
    532552                            (AddressElement) conflictModel.getSelectedItem()));
    … …  
    534554                reassignButton.setEnabled(true);
    535555            } else if (conflictModel.getSelectedItem() instanceof OsmPrimitive) {
    536                 reassignButton.setEnabled( selected !=
     556                reassignButton.setEnabled(selected !=
    537557                        Reasoner.getInstance().getStrictlyBest(
    538558                            (OsmPrimitive) conflictModel.getSelectedItem()));
    … …  
    542562        }
    543563
     564        @Override
    544565        public Object getSelectedItem() {
    545566            return selected;
    546567        }
    547568
     569        @Override
    548570        public int getSize() {
    549571            return primitives.size();
    550572        }
    551573
     574        @Override
    552575        public E getElementAt(int index) {
    553576            if (index < primitives.size())
    … …  
    556579        }
    557580
     581        @Override
    558582        public void addListDataListener(ListDataListener l) {
    559583            listeners.add(l);
    560584        }
    561585
     586        @Override
    562587        public void removeListDataListener(ListDataListener l) {
    563588            listeners.remove(l);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
    … …  
    45import java.awt.Font;
    56import java.awt.LayoutManager;
     7import java.awt.event.ActionEvent;
     8import java.awt.event.ActionListener;
    69import java.awt.event.KeyEvent;
    710import java.awt.event.MouseEvent;
    … …  
    1215
    1316import javax.swing.DefaultListCellRenderer;
     17import javax.swing.GroupLayout;
    1418import javax.swing.ImageIcon;
    1519import javax.swing.JList;
    16 
     20import javax.swing.LayoutStyle;
     21
     22import org.openstreetmap.josm.Main;
    1723import org.openstreetmap.josm.data.SelectionChangedListener;
    1824import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    4147 * @author Radomír Černoch, radomir.cernoch@gmail.com
    4248 */
    43 public class FactoryDialog extends ToggleDialog
     49public final class FactoryDialog extends ToggleDialog
    4450        implements SelectionChangedListener, StatusListener, ReasonerListener {
    4551
    46 
    4752    private static FactoryDialog singleton = null;
    48     public  static FactoryDialog getInstance() {
     53
     54    public static FactoryDialog getInstance() {
    4955        if (singleton == null)
    5056            singleton = new FactoryDialog();
    … …  
    5258    }
    5359
    54     private HouseListModel  houseModel  = new HouseListModel();
     60    private HouseListModel houseModel = new HouseListModel();
    5561    private StreetListModel streetModel = new StreetListModel();
    5662
    5763    private FactoryDialog() {
    5864
    59         super( "Továrna na adresy",
     65        super("Továrna na adresy",
    6066               "envelope-scrollbar.png",
    6167               "Umožňuje rychlé vytváření adresních bodů „jedním kliknutím.“",
    62                 Shortcut.registerShortcut("subwindow:addressfactory","Přepnout: Továrna na adresy",
     68                Shortcut.registerShortcut("subwindow:addressfactory", "Přepnout: Továrna na adresy",
    6369                    KeyEvent.VK_Q, Shortcut.ALT_CTRL_SHIFT),
    6470                200);
    … …  
    113119    public void setSelectedHouse(House house) {
    114120
    115         for (int i=0; i<streetModel.getSize(); i++)
     121        for (int i = 0; i < streetModel.getSize(); i++)
    116122            if (streetModel.getElementAt(i) == house.getParent()) {
    117123                streetComboBox.setSelectedIndex(i);
    … …  
    120126            }
    121127
    122         for (int i=0; i<houseModel.getSize(); i++)
     128        for (int i = 0; i < houseModel.getSize(); i++)
    123129            if (houseModel.getElementAt(i) == house) {
    124130                houseList.setSelectedIndex(i);
    … …  
    130136    public House getSelectedHouse() {
    131137        if (houseList.getSelectedValue() instanceof House)
    132             return (House) houseList.getSelectedValue();
     138            return houseList.getSelectedValue();
    133139        return null;
    134140    }
    … …  
    139145        int i = houseList.getSelectedIndex();
    140146        while (i < houseModel.getSize()) {
    141             if (r.translate((House) houseModel.getElementAt(i)) == null)
     147            if (r.translate(houseModel.getElementAt(i)) == null)
    142148                return true;
    143149            i++;
    … …  
    146152        i = 0;
    147153        while (i < houseList.getSelectedIndex()) {
    148             if (r.translate((House) houseModel.getElementAt(i)) == null)
     154            if (r.translate(houseModel.getElementAt(i)) == null)
    149155                return true;
    150156            i++;
    … …  
    159165        index++; // Initial kick to do at least one move.
    160166        House current;
    161         while ( (current = houseModel.getElementAt(index)) != null
    162              && Reasoner.getInstance().translate(current) != null)
     167        while ((current = houseModel.getElementAt(index)) != null
     168             && Reasoner.getInstance().translate(current) != null) {
    163169            index++;
     170        }
    164171
    165172        if (index >= houseModel.getSize())
    … …  
    195202        // If anything goes wrong, we can silently ignore the errors.
    196203        // The selected item just does not get updated...
    197         } catch (Exception exp) {}
     204        } catch (Exception exp) {
     205            Main.trace(exp);
     206        }
    198207    }
    199208
    … …  
    293302        relocateButton.setText("Inicializovat");
    294303        relocateButton.setEnabled(false);
    295         relocateButton.addActionListener(new java.awt.event.ActionListener() {
     304        relocateButton.addActionListener(new ActionListener() {
    296305            @Override
    297             public void actionPerformed(java.awt.event.ActionEvent evt) {
     306            public void actionPerformed(ActionEvent evt) {
    298307                relocateButtonActionPerformed(evt);
    299308            }
    … …  
    304313        streetComboBox.setFocusable(false);
    305314
    306         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
     315        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    307316        mainPanel.setLayout(mainPanelLayout);
    308317        mainPanelLayout.setHorizontalGroup(
    309             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    310             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
     318            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     319            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
    311320                .addComponent(streetComboBox, 0, 199, Short.MAX_VALUE)
    312321                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    313322                .addComponent(relocateButton))
    314323            .addGroup(mainPanelLayout.createSequentialGroup()
    315                 .addComponent(keepOddityCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
     324                .addComponent(keepOddityCheckBox, GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
    316325                .addContainerGap())
    317             .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE)
     326            .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE)
    318327        );
    319328        mainPanelLayout.setVerticalGroup(
    320             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     329            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    321330            .addGroup(mainPanelLayout.createSequentialGroup()
    322                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    323                     .addComponent(streetComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     331                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     332                    .addComponent(streetComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    324333                    .addComponent(relocateButton))
    325                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    326                 .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
    327                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
     334                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
     335                .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
     336                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
    328337                .addComponent(keepOddityCheckBox))
    329338        );
    330339
    331340        add(mainPanel);
    332     }// </editor-fold>//GEN-END:initComponents
    333 
    334     private void relocateButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_relocateButtonActionPerformed
     341    } // </editor-fold>//GEN-END:initComponents
     342
     343    private void relocateButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_relocateButtonActionPerformed
    335344        CzechAddressPlugin.changeLocation();
    336     }//GEN-LAST:event_relocateButtonActionPerformed
    337 
    338     private void houseListClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_houseListClicked
     345    } //GEN-LAST:event_relocateButtonActionPerformed
     346
     347    private void houseListClicked(java.awt.event.MouseEvent evt) { //GEN-FIRST:event_houseListClicked
    339348        if (evt.getClickCount() == 2 && evt.getButton() == MouseEvent.BUTTON1) {
    340349            Reasoner r = Reasoner.getInstance();
    … …  
    345354                ConflictResolver.getInstance().focusElement(getSelectedHouse());
    346355        }
    347     }//GEN-LAST:event_houseListClicked
     356    } //GEN-LAST:event_houseListClicked
    348357
    349358
    … …  
    361370        houseModel.notifyAllListeners();
    362371    }
     372
    363373    @Override
    364374    public void primitiveChanged(OsmPrimitive prim) {}
     375
    365376    @Override
    366377    public void resonerReseted() {}
    … …  
    427438
    428439    private class AllStreetProvider extends ElementWithHouses {
    429         public AllStreetProvider() {
     440        AllStreetProvider() {
    430441            super("všechny domy");
    431442        }
    … …  
    440451                                     implements ReasonerListener {
    441452
    442         public FreeStreetProvider() {
     453        FreeStreetProvider() {
    443454            super("nepřiřazené domy");
    444455            Reasoner.getInstance().addListener(this);
    … …  
    446457
    447458        @Override
    448         public void resonerReseted() { houses.clear(); }
     459        public void resonerReseted() {
     460            houses.clear();
     461        }
     462
    449463        @Override
    450464        public void primitiveChanged(OsmPrimitive prim) {}
     465
    451466        @Override
    452467        public void elementChanged(AddressElement elem) {
    … …  
    458473                if (index >= 0) houses.remove(index);
    459474            } else {
    460                 if (index < 0)  houses.add(-index-1, house);
     475                if (index < 0) houses.add(-index-1, house);
    461476            }
    462477
    … …  
    475490                = new ArrayList<>();
    476491
    477         public StreetListModel() {
     492        StreetListModel() {
    478493            metaElem.add(null);
    479494            metaElem.add(new AllStreetProvider());
    … …  
    491506
    492507            this.selected = parent;
    493             this.parent   = parent;
     508            this.parent = parent;
    494509
    495510            metaElem.set(0, parent);
    … …  
    531546                                 implements ReasonerListener {
    532547
    533         public HouseListModel() {
     548        HouseListModel() {
    534549            Reasoner.getInstance().addListener(this);
    535550        }
    … …  
    557572        @Override
    558573        public void primitiveChanged(OsmPrimitive prim) {}
     574
    559575        @Override
    560576        public void elementChanged(AddressElement elem) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java

    r29727 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
    … …  
    4849    public GroupManipulatorDialog() {
    4950        super(Main.parent, "Přiřadit adresy",
    50                             new String[] { "OK", "Zrušit" }, true);
     51                            new String[] {"OK", "Zrušit"}, true);
    5152        initComponents();
    5253
    … …  
    115116        locationChangeButton.setText("Změnit");
    116117        locationChangeButton.addActionListener(new java.awt.event.ActionListener() {
     118            @Override
    117119            public void actionPerformed(java.awt.event.ActionEvent evt) {
    118120                locationChangeButtonActionPerformed(evt);
    … …  
    163165
    164166        add(mainPanel);
    165     }// </editor-fold>//GEN-END:initComponents
     167    } // </editor-fold>//GEN-END:initComponents
    166168
    167169    /**
    … …  
    169171     * the current location.
    170172     */
    171     private void locationChangeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_locationChangeButtonActionPerformed
     173    private void locationChangeButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_locationChangeButtonActionPerformed
    172174        CzechAddressPlugin.changeLocation();
    173     }//GEN-LAST:event_locationChangeButtonActionPerformed
    174 
    175     private void proposalTreeKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_proposalTreeKeyReleased
     175    } //GEN-LAST:event_locationChangeButtonActionPerformed
     176
     177    private void proposalTreeKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalTreeKeyReleased
    176178        if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
    177179
    … …  
    186188                } else if (path.getLastPathComponent() instanceof ProposalContainer) {
    187189                    ((ProposalDatabase) proposalTree.getModel())
    188                             .removeContainer( (ProposalContainer)
    189                                                     path.getLastPathComponent() );
     190                            .removeContainer((ProposalContainer)
     191                                                    path.getLastPathComponent());
    190192                }
    191193            }
    192194        }
    193     }//GEN-LAST:event_proposalTreeKeyReleased
     195    } //GEN-LAST:event_proposalTreeKeyReleased
    194196
    195197    // Variables declaration - do not modify//GEN-BEGIN:variables
    … …  
    203205    // End of variables declaration//GEN-END:variables
    204206
     207    @Override
    205208    public void elementChanged(AddressElement elem) {
    206209        for (ProposalContainer container : database.getContainers()) {
    … …  
    212215    }
    213216
     217    @Override
    214218    public void primitiveChanged(OsmPrimitive prim) {
    215219        for (ProposalContainer container : database.getContainers()) {
    … …  
    221225    }
    222226
     227    @Override
    223228    public void resonerReseted() {
    224229        recreateProposals();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
    … …  
    3031 * @author Libor Pechacek, lpechacek@gmx.com
    3132 */
    32 public class LocationSelector extends ExtendedDialog {
     33public final class LocationSelector extends ExtendedDialog {
    3334
    3435    protected ElementWithStreets selectedElement;
    … …  
    3940    protected ArrayList<AddressElement> hlSuburbs = new ArrayList<>();
    4041
    41 
    4242    public static ElementWithStreets selectLocation() {
    4343        LocationSelector ls = (LocationSelector) new LocationSelector().showDialog();
    … …  
    5151    private LocationSelector() {
    5252        super(Main.parent, "Výběr umístění",
    53                             new String[] { "OK", "Zrušit"}, true);
     53                            new String[] {"OK", "Zrušit"}, true);
    5454
    5555        initComponents();
    … …  
    211211
    212212        oblastComboBox.addItemListener(new java.awt.event.ItemListener() {
     213            @Override
    213214            public void itemStateChanged(java.awt.event.ItemEvent evt) {
    214215                oblastComboBoxItemStateChanged(evt);
    … …  
    217218
    218219        suburbComboBox.addItemListener(new java.awt.event.ItemListener() {
     220            @Override
    219221            public void itemStateChanged(java.awt.event.ItemEvent evt) {
    220222                suburbComboBoxItemStateChanged(evt);
    … …  
    223225
    224226        vitociComboBox.addItemListener(new java.awt.event.ItemListener() {
     227            @Override
    225228            public void itemStateChanged(java.awt.event.ItemEvent evt) {
    226229                vitociComboBoxItemStateChanged(evt);
    … …  
    267270
    268271        getContentPane().add(mainPanel);
    269     }// </editor-fold>//GEN-END:initComponents
     272    } // </editor-fold>//GEN-END:initComponents
    270273
    271274    /**
    … …  
    292295    }*/
    293296
    294     private void oblastComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_oblastComboBoxItemStateChanged
     297    private void oblastComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_oblastComboBoxItemStateChanged
    295298
    296299        Region oblast = (Region) oblastComboBox.getSelectedItem();
    … …  
    303306        vitociComboBox.setEnabled(vitociComboBox.getModel().getSize() > 1);
    304307        vitociComboBoxItemStateChanged(null);
    305     }//GEN-LAST:event_oblastComboBoxItemStateChanged
    306 
    307     private void vitociComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_vitociComboBoxItemStateChanged
     308    } //GEN-LAST:event_oblastComboBoxItemStateChanged
     309
     310    private void vitociComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_vitociComboBoxItemStateChanged
    308311
    309312        ViToCi obec = (ViToCi) vitociComboBox.getSelectedItem();
    … …  
    312315        if (obec.getSuburbs().size() > 0) {
    313316            ElementWithStreets[] suburbs = new ElementWithStreets[obec.getSuburbs().size() + 1];
    314             for (int i=0; i<obec.getSuburbs().size(); i++)
     317            for (int i = 0; i < obec.getSuburbs().size(); i++)
    315318                suburbs[i] = obec.getSuburbs().get(i);
    316319            suburbs[obec.getSuburbs().size()] = obec;
    … …  
    324327        suburbComboBox.setEnabled(suburbComboBox.getModel().getSize() > 1);
    325328        suburbComboBoxItemStateChanged(null);
    326     }//GEN-LAST:event_vitociComboBoxItemStateChanged
    327 
    328         private void suburbComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_suburbComboBoxItemStateChanged
     329    } //GEN-LAST:event_vitociComboBoxItemStateChanged
     330
     331        private void suburbComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_suburbComboBoxItemStateChanged
    329332
    330333        /*if (castObceComboBox.getSelectedItem() != null)
    … …  
    346349            selectedElement = ((ElementWithStreets) oblastComboBox.getSelectedItem());
    347350
    348         }//GEN-LAST:event_suburbComboBoxItemStateChanged
     351        } //GEN-LAST:event_suburbComboBoxItemStateChanged
    349352
    350353    // Variables declaration - do not modify//GEN-BEGIN:variables

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
    … …  
    6667
    6768        renameTable.setModel(streetModel);
    68         renameTable.setDefaultRenderer( AddressElement.class,
     69        renameTable.setDefaultRenderer(AddressElement.class,
    6970                                        new AddressElementRenderer());
    70         renameTable.setDefaultRenderer( String.class,
     71        renameTable.setDefaultRenderer(String.class,
    7172                                        new AddressElementRenderer());
    7273
    … …  
    9091        }
    9192
     93        @Override
    9294        public Object getChild(Object parent, int index) {
    9395
    … …  
    101103                Suburb suburb = (Suburb) parent;
    102104
    103                 if (index< suburb.getHouses().size())
     105                if (index < suburb.getHouses().size())
    104106                    return suburb.getHouses().get(index);
    105107                else
    106108                    index -= suburb.getHouses().size();
    107109
    108                 if (index< suburb.getStreets().size())
     110                if (index < suburb.getStreets().size())
    109111                    return suburb.getStreets().get(index);
    110112                else
    … …  
    115117                ViToCi vitoci = (ViToCi) parent;
    116118
    117                 if (index< vitoci.getHouses().size())
     119                if (index < vitoci.getHouses().size())
    118120                    return vitoci.getHouses().get(index);
    119121                else
    120122                    index -= vitoci.getHouses().size();
    121123
    122                 if (index< vitoci.getStreets().size())
     124                if (index < vitoci.getStreets().size())
    123125                    return vitoci.getStreets().get(index);
    124126                else
    125127                    index -= vitoci.getStreets().size();
    126128
    127                 if (index< vitoci.getSuburbs().size())
     129                if (index < vitoci.getSuburbs().size())
    128130                    return vitoci.getSuburbs().get(index);
    129131                else
    … …  
    134136                Region region = (Region) parent;
    135137
    136                 if (index< region.getHouses().size())
     138                if (index < region.getHouses().size())
    137139                    return region.getHouses().get(index);
    138140                else
    139141                    index -= region.getHouses().size();
    140142
    141                 if (index< region.getStreets().size())
     143                if (index < region.getStreets().size())
    142144                    return region.getStreets().get(index);
    143145                else
    144146                    index -= region.getStreets().size();
    145147
    146                 if (index< region.getViToCis().size())
     148                if (index < region.getViToCis().size())
    147149                    return region.getViToCis().get(index);
    148150                else
    … …  
    156158        }
    157159
     160        @Override
    158161        public int getChildCount(Object parent) {
    159162
    … …  
    184187        }
    185188
     189        @Override
    186190        public int getIndexOfChild(Object parent, Object child) {
    187191            return 0;
    … …  
    215219
    216220        renameTable.setModel(new javax.swing.table.DefaultTableModel(
    217             new Object [][] {
     221            new Object[][] {
    218222                {null, null},
    219223                {null, null},
    … …  
    221225                {null, null}
    222226            },
    223             new String [] {
     227            new String[] {
    224228                "Původní název", "Návrh z mapy"
    225229            }
    226230        ) {
    227             Class<?>[] types = new Class [] {
     231            Class<?>[] types = new Class[] {
    228232                java.lang.Object.class, java.lang.String.class
    229233            };
    230             boolean[] canEdit = new boolean [] {
     234            boolean[] canEdit = new boolean[] {
    231235                false, true
    232236            };
    233237
     238            @Override
    234239            public Class<?> getColumnClass(int columnIndex) {
    235                 return types [columnIndex];
    236             }
    237 
     240                return types[columnIndex];
     241            }
     242
     243            @Override
    238244            public boolean isCellEditable(int rowIndex, int columnIndex) {
    239                 return canEdit [columnIndex];
     245                return canEdit[columnIndex];
    240246            }
    241247        });
    … …  
    245251        renamerButton.setText("Použít navržené změny");
    246252        renamerButton.addActionListener(new java.awt.event.ActionListener() {
     253            @Override
    247254            public void actionPerformed(java.awt.event.ActionEvent evt) {
    248255                renamerButtonActionPerformed(evt);
    … …  
    272279
    273280        dbTree.addTreeSelectionListener(new javax.swing.event.TreeSelectionListener() {
     281            @Override
    274282            public void valueChanged(javax.swing.event.TreeSelectionEvent evt) {
    275283                dbTreeValueChanged(evt);
    … …  
    281289        dbEditButton.setEnabled(false);
    282290        dbEditButton.addActionListener(new java.awt.event.ActionListener() {
     291            @Override
    283292            public void actionPerformed(java.awt.event.ActionEvent evt) {
    284293                dbEditButtonActionPerformed(evt);
    … …  
    312321
    313322        pack();
    314     }// </editor-fold>//GEN-END:initComponents
    315 
    316     private void renamerButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_renamerButtonActionPerformed
     323    } // </editor-fold>//GEN-END:initComponents
     324
     325    private void renamerButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_renamerButtonActionPerformed
    317326        assert streetModel.elems.size() == streetModel.names.size();
    318327        Reasoner r = Reasoner.getInstance();
    … …  
    320329        synchronized (r) {
    321330            r.openTransaction();
    322             for(int i=0; i<streetModel.elems.size(); i++) {
     331            for (int i = 0; i < streetModel.elems.size(); i++) {
    323332                streetModel.elems.get(i).setName(streetModel.names.get(i));
    324333                r.update(streetModel.elems.get(i));
    … …  
    330339        streetModel.names.clear();
    331340        jPanel1.setVisible(false);
    332     }//GEN-LAST:event_renamerButtonActionPerformed
     341    } //GEN-LAST:event_renamerButtonActionPerformed
    333342
    334343    private AddressElement dbTreeValue = null;
    335344
    336     private void dbTreeValueChanged(javax.swing.event.TreeSelectionEvent evt) {//GEN-FIRST:event_dbTreeValueChanged
     345    private void dbTreeValueChanged(javax.swing.event.TreeSelectionEvent evt) { //GEN-FIRST:event_dbTreeValueChanged
    337346        try {
    338347            dbTreeValue = (AddressElement) dbTree.getSelectionPath().getLastPathComponent();
    … …  
    343352            except.printStackTrace();
    344353        }
    345         dbEditButton.setEnabled( EditorFactory.isEditable(dbTreeValue) );
    346     }//GEN-LAST:event_dbTreeValueChanged
    347 
    348     private void dbEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dbEditButtonActionPerformed
     354        dbEditButton.setEnabled(EditorFactory.isEditable(dbTreeValue));
     355    } //GEN-LAST:event_dbTreeValueChanged
     356
     357    private void dbEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_dbEditButtonActionPerformed
    349358        if (EditorFactory.isEditable(dbTreeValue)) {
    350359            if (EditorFactory.edit(dbTreeValue))
    … …  
    352361        } else
    353362            dbEditButton.setEnabled(false);
    354     }//GEN-LAST:event_dbEditButtonActionPerformed
     363    } //GEN-LAST:event_dbEditButtonActionPerformed
    355364
    356365    // Variables declaration - do not modify//GEN-BEGIN:variables
    … …  
    369378    private class AddressElementRenderer extends DefaultTableCellRenderer {
    370379
    371         public AddressElementRenderer() {}
     380        AddressElementRenderer() {}
    372381
    373382        @Override
    … …  
    376385
    377386            if (value instanceof AddressElement)
    378                 setText(((AddressElement) value).getName() );
     387                setText(((AddressElement) value).getName());
    379388        }
    380389    }
    … …  
    383392
    384393        List<Element> elems = new ArrayList<>();
    385         List<String>  names = new ArrayList<>();
    386 
     394        List<String> names = new ArrayList<>();
     395
     396        @Override
    387397        public int getRowCount() {
    388398            assert elems.size() == names.size();
    … …  
    390400        }
    391401
     402        @Override
    392403        public int getColumnCount() {
    393404            return 2;
    394405        }
    395406
     407        @Override
    396408        public String getColumnName(int columnIndex) {
    397409            if (columnIndex == 0) return "Původní název";
    … …  
    401413        }
    402414
     415        @Override
    403416        public Class<?> getColumnClass(int columnIndex) {
    404417            if (columnIndex == 0) return AddressElement.class;
    … …  
    408421        }
    409422
     423        @Override
    410424        public boolean isCellEditable(int rowIndex, int columnIndex) {
    411425            return columnIndex == 1;
    412426        }
    413427
     428        @Override
    414429        public Object getValueAt(int rowIndex, int columnIndex) {
    415430            if (columnIndex == 0) return elems.get(rowIndex);
    … …  
    419434        }
    420435
     436        @Override
    421437        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
    422438            assert columnIndex == 1;
    … …  
    424440        }
    425441
     442        @Override
    426443        public void addTableModelListener(TableModelListener l) {
    427444
    428445        }
    429446
     447        @Override
    430448        public void removeTableModelListener(TableModelListener l) {
    431449

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui;
    23
    … …  
    5152
    5253        super(Main.parent, "Adresní bod",
    53                             new String[] { "OK", "Zrušit" }, true);
     54                            new String[] {"OK", "Zrušit"}, true);
    5455        initComponents();
    5556
    5657        // Create action for delaying the database query...
    5758        updateMatchesAction = new AbstractAction() {
     59            @Override
    5860            public void actionPerformed(ActionEvent e) {
    5961                updateMatches();
    … …  
    8183        // And finalize initializing the form.
    8284        setContent(mainPanel, false);
    83         setButtonIcons(new String[] { "ok.png", "cancel.png" });
     85        setButtonIcons(new String[] {"ok.png", "cancel.png"});
    8486        setDefaultButton(1);
    8587        setCancelButton(2);
    … …  
    140142
    141143        synchronized (r) {
    142             Map<String,String> backup = prim.getKeys();
     144            Map<String, String> backup = prim.getKeys();
    143145            r.openTransaction();
    144             for (AddressElement elem : r.getCandidates(prim))
     146            for (AddressElement elem : r.getCandidates(prim)) {
    145147                r.unOverwrite(prim, elem);
     148            }
    146149            prim.setKeys(null);
    147150            prim.put(PrimUtils.KEY_ADDR_CP, alternateNumberEdit.getText());
    … …  
    170173    }
    171174
     175    @Override
    172176    public void pluginStatusChanged(int message) {
    173177
    … …  
    223227        changeLocationButton.setFocusable(false);
    224228        changeLocationButton.addActionListener(new java.awt.event.ActionListener() {
     229            @Override
    225230            public void actionPerformed(java.awt.event.ActionEvent evt) {
    226231                changeLocationButtonActionPerformed(evt);
    … …  
    238243        //matchesComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "" }));
    239244        matchesComboBox.addItemListener(new java.awt.event.ItemListener() {
     245            @Override
    240246            public void itemStateChanged(java.awt.event.ItemEvent evt) {
    241247                matchChanged(evt);
    … …  
    290296
    291297        getContentPane().add(mainPanel);
    292     }// </editor-fold>//GEN-END:initComponents
    293 
    294     private void changeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeLocationButtonActionPerformed
     298    } // </editor-fold>//GEN-END:initComponents
     299
     300    private void changeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_changeLocationButtonActionPerformed
    295301        CzechAddressPlugin.changeLocation();
    296     }//GEN-LAST:event_changeLocationButtonActionPerformed
    297 
    298     private void keyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_keyReleased
     302    } //GEN-LAST:event_changeLocationButtonActionPerformed
     303
     304    private void keyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_keyReleased
    299305        if (updateMatchesTimer != null)
    300306            updateMatchesTimer.stop();
    … …  
    303309        updateMatchesTimer.setRepeats(false);
    304310        updateMatchesTimer.start();
    305     }//GEN-LAST:event_keyReleased
    306 
    307     private void proposalListKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_proposalListKeyReleased
     311    } //GEN-LAST:event_keyReleased
     312
     313    private void proposalListKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalListKeyReleased
    308314        if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
    309315            for (Object o : proposalList.getSelectedValuesList())
    310316                proposalContainer.removeProposal((Proposal) o);
    311317        }
    312     }//GEN-LAST:event_proposalListKeyReleased
    313 
    314     private void matchChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_matchChanged
     318    } //GEN-LAST:event_proposalListKeyReleased
     319
     320    private void matchChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_matchChanged
    315321
    316322        if (matchesComboBox.getSelectedItem() == null) return;
    … …  
    328334
    329335
    330     }//GEN-LAST:event_matchChanged
     336    } //GEN-LAST:event_matchChanged
    331337
    332338
    … …  
    360366        }
    361367
     368        @Override
    362369        public void setSelectedItem(Object anItem) {
    363370            if (matches == null) return;
    … …  
    370377        }
    371378
     379        @Override
    372380        public Object getSelectedItem() {
    373381            return selected;
    374382        }
    375383
     384        @Override
    376385        public int getSize() {
    377386            if (matches == null) return 0;
    … …  
    379388        }
    380389
     390        @Override
    381391        public AddressElement getElementAt(int index) {
    382392            if (matches == null) return null;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java

    r29727 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java

    r29854 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
     3
     4import javax.swing.JButton;
     5import javax.swing.JLabel;
     6import javax.swing.JPanel;
     7import javax.swing.JTextField;
    28
    39import org.openstreetmap.josm.Main;
    … …  
    4450        return coField.getText();
    4551    }
     52
    4653    public String getCP() {
    4754        return cpField.getText();
    … …  
    5663    private void initComponents() {
    5764
    58         mainPanel = new javax.swing.JPanel();
    59         jLabel1 = new javax.swing.JLabel();
    60         jTextField1 = new javax.swing.JTextField();
    61         parentField = new javax.swing.JTextField();
    62         jLabel2 = new javax.swing.JLabel();
    63         cpField = new javax.swing.JTextField();
    64         coField = new javax.swing.JTextField();
    65         jLabel3 = new javax.swing.JLabel();
    66         parentEditButton = new javax.swing.JButton();
     65        mainPanel = new JPanel();
     66        jLabel1 = new JLabel();
     67        jTextField1 = new JTextField();
     68        parentField = new JTextField();
     69        jLabel2 = new JLabel();
     70        cpField = new JTextField();
     71        coField = new JTextField();
     72        jLabel3 = new JLabel();
     73        parentEditButton = new JButton();
    6774
    6875        setLayout(new java.awt.GridLayout());
    … …  
    8087        parentEditButton.setText("    ");
    8188        parentEditButton.addActionListener(new java.awt.event.ActionListener() {
     89            @Override
    8290            public void actionPerformed(java.awt.event.ActionEvent evt) {
    8391                parentEditButtonActionPerformed(evt);
    … …  
    123131
    124132        add(mainPanel);
    125     }// </editor-fold>//GEN-END:initComponents
     133    } // </editor-fold>//GEN-END:initComponents
    126134
    127     private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
     135    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
    128136        assert parent != null;
    129137        if (EditorFactory.edit(parent))
    130138            parentField.setText(parent.getName());
    131     }//GEN-LAST:event_parentEditButtonActionPerformed
     139    } //GEN-LAST:event_parentEditButtonActionPerformed
    132140
    133141

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java

    r30532 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
    23
    … …  
    8990
    9091        houseList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
     92            @Override
    9193            public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
    9294                houseListChanged(evt);
    … …  
    9799        parentEditButton.setText("    ");
    98100        parentEditButton.addActionListener(new java.awt.event.ActionListener() {
     101            @Override
    99102            public void actionPerformed(java.awt.event.ActionEvent evt) {
    100103                parentEditButtonActionPerformed(evt);
    … …  
    104107        houseEditButton.setText("    ");
    105108        houseEditButton.addActionListener(new java.awt.event.ActionListener() {
     109            @Override
    106110            public void actionPerformed(java.awt.event.ActionEvent evt) {
    107111                houseEditButtonActionPerformed(evt);
    … …  
    151155
    152156        getContentPane().add(mainPanel);
    153     }// </editor-fold>//GEN-END:initComponents
     157    } // </editor-fold>//GEN-END:initComponents
    154158
    155159    private House selectedHouse = null;
    156160
    157     private void houseListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_houseListChanged
    158         selectedHouse = (House) houseList.getSelectedValue();
     161    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_houseListChanged
     162        selectedHouse = houseList.getSelectedValue();
    159163        houseEditButton.setEnabled(EditorFactory.isEditable(selectedHouse));
    160     }//GEN-LAST:event_houseListChanged
     164    } //GEN-LAST:event_houseListChanged
    161165
    162     private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_houseEditButtonActionPerformed
     166    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_houseEditButtonActionPerformed
    163167        assert selectedHouse != null;
    164168        if (EditorFactory.editHouse(selectedHouse))
    165169            houseList.setModel(new DefaultComboBoxModel<>(street.getHouses().toArray(new House[0])));
    166     }//GEN-LAST:event_houseEditButtonActionPerformed
     170    } //GEN-LAST:event_houseEditButtonActionPerformed
    167171
    168     private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
     172    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
    169173        assert parent != null;
    170174        if (EditorFactory.edit(parent))
    171175            parentField.setText(parent.getName());
    172     }//GEN-LAST:event_parentEditButtonActionPerformed
     176    } //GEN-LAST:event_parentEditButtonActionPerformed
    173177
    174178

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java

    r30532 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
    23
    … …  
    102103
    103104        houseList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
     105            @Override
    104106            public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
    105107                houseListChanged(evt);
    … …  
    110112        parentEditButton.setText("    ");
    111113        parentEditButton.addActionListener(new java.awt.event.ActionListener() {
     114            @Override
    112115            public void actionPerformed(java.awt.event.ActionEvent evt) {
    113116                parentEditButtonActionPerformed(evt);
    … …  
    117120        houseEditButton.setText("    ");
    118121        houseEditButton.addActionListener(new java.awt.event.ActionListener() {
     122            @Override
    119123            public void actionPerformed(java.awt.event.ActionEvent evt) {
    120124                houseEditButtonActionPerformed(evt);
    … …  
    123127
    124128        streetList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
     129            @Override
    125130            public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
    126131                streetListChanged(evt);
    … …  
    131136        streetEditButton.setText("    ");
    132137        streetEditButton.addActionListener(new java.awt.event.ActionListener() {
     138            @Override
    133139            public void actionPerformed(java.awt.event.ActionEvent evt) {
    134140                streetEditButtonActionPerformed(evt);
    … …  
    193199
    194200        add(mainPanel);
    195     }// </editor-fold>//GEN-END:initComponents
     201    } // </editor-fold>//GEN-END:initComponents
    196202
    197203    private House selectedHouse = null;
    198204    private Street selectedStreet = null;
    199205
    200     private void houseListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_houseListChanged
    201         selectedHouse = (House) houseList.getSelectedValue();
     206    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_houseListChanged
     207        selectedHouse = houseList.getSelectedValue();
    202208        houseEditButton.setEnabled(EditorFactory.isEditable(selectedHouse));
    203 }//GEN-LAST:event_houseListChanged
    204 
    205     private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
     209} //GEN-LAST:event_houseListChanged
     210
     211    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
    206212        assert parent != null;
    207213        if (EditorFactory.edit(parent))
    208214            parentField.setText(parent.getName());
    209 }//GEN-LAST:event_parentEditButtonActionPerformed
    210 
    211     private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_houseEditButtonActionPerformed
     215} //GEN-LAST:event_parentEditButtonActionPerformed
     216
     217    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_houseEditButtonActionPerformed
    212218        assert selectedHouse != null;
    213219        if (EditorFactory.editHouse(selectedHouse))
    214220            houseList.setModel(new DefaultComboBoxModel<>(suburb.getHouses().toArray(new House[0])));
    215 }//GEN-LAST:event_houseEditButtonActionPerformed
    216 
    217     private void streetListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_streetListChanged
    218         selectedStreet = (Street) streetList.getSelectedValue();
     221} //GEN-LAST:event_houseEditButtonActionPerformed
     222
     223    private void streetListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_streetListChanged
     224        selectedStreet = streetList.getSelectedValue();
    219225        streetEditButton.setEnabled(EditorFactory.isEditable(selectedStreet));
    220     }//GEN-LAST:event_streetListChanged
    221 
    222     private void streetEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_streetEditButtonActionPerformed
     226    } //GEN-LAST:event_streetListChanged
     227
     228    private void streetEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_streetEditButtonActionPerformed
    223229        assert selectedStreet != null;
    224230        if (EditorFactory.editStreet(selectedStreet))
    225231            streetList.setModel(new DefaultComboBoxModel<>(suburb.getStreets().toArray(new Street[0])));
    226     }//GEN-LAST:event_streetEditButtonActionPerformed
     232    } //GEN-LAST:event_streetEditButtonActionPerformed
    227233
    228234

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import java.util.ArrayList;
    45import java.util.List;
     6
    57import javax.swing.ComboBoxModel;
    68import javax.swing.event.ListDataEvent;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import java.util.ArrayList;
    45import java.util.List;
     6
    57import javax.swing.ListModel;
    68import javax.swing.event.ListDataEvent;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import java.util.ArrayList;
    45import java.util.List;
     6
    57import javax.swing.event.TreeModelEvent;
    68import javax.swing.event.TreeModelListener;
    … …  
    2325
    2426    protected String root;
     27    @Override
    2528    public Object getRoot() {
    2629        return root;
    2730    }
    2831
     32    @Override
    2933    public void addTreeModelListener(TreeModelListener l) {
    3034        listeneres.add(l);
    3135    }
    3236
     37    @Override
    3338    public void removeTreeModelListener(TreeModelListener l) {
    3439        listeneres.remove(l);
    3540    }
    3641
     42    @Override
    3743    public boolean isLeaf(Object node) {
    3844        return getChildCount(node) == 0;
    3945    }
    4046
     47    @Override
    4148    public void valueForPathChanged(TreePath path, Object newValue) {
    4249

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import java.awt.Component;
     5
    46import javax.swing.DefaultListCellRenderer;
    57import javax.swing.JList;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java

    r23190 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import javax.swing.ImageIcon;
     5
    46import org.openstreetmap.josm.data.osm.Node;
    57import org.openstreetmap.josm.data.osm.OsmPrimitive;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java

    r15585 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
    23
    34import java.awt.Component;
     5
    46import javax.swing.JTree;
    57import javax.swing.tree.DefaultTreeCellRenderer;
     8
    69import org.openstreetmap.josm.data.osm.OsmPrimitive;
    710import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.intelligence;
    23
    … …  
    2728
    2829    Map<Street, OsmPrimitive> map;
    29     Logger logger =  Logger.getLogger(Capitalizator.class.getName());
     30    Logger logger = Logger.getLogger(Capitalizator.class.getName());
    3031
    3132    public Capitalizator(Collection<OsmPrimitive> prims, List<Street> elems) {
    … …  
    3334        int expResults = elems.size()/2;
    3435
    35         map  = new HashMap<>(expResults);
     36        map = new HashMap<>(expResults);
    3637        ExecutorService serv = Executors.newCachedThreadPool();
    3738        Map<Street, Future<OsmPrimitive>> results
    3839                = new HashMap<>(expResults);
    3940
    40         for (Street elem : elems)
     41        for (Street elem : elems) {
    4142             results.put(elem, serv.submit(new StreetMatcher(elem, prims)));
     43        }
    4244
    4345        for (Street elem : results.keySet()) {
    … …  
    6264        private Collection<OsmPrimitive> prims;
    6365
    64         public StreetMatcher(AddressElement elem, Collection<OsmPrimitive> prims) {
     66        StreetMatcher(AddressElement elem, Collection<OsmPrimitive> prims) {
    6567            this.elem = elem;
    6668            this.prims = prims;
    6769        }
    6870
     71        @Override
    6972        public OsmPrimitive call() throws Exception {
    7073

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.intelligence;
    23
    … …  
    89import java.util.logging.Level;
    910import java.util.logging.Logger;
     11
    1012import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1113import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
    … …  
    3537 * @author Radomír Černoch radomir.cernoch@gmail.com
    3638 */
    37 public class Reasoner {
    38 
     39public final class Reasoner {
     40
     41    // CHECKSTYLE.OFF: SingleSpaceSeparator
    3942    public static final int MATCH_OVERWRITE = 4;
    4043    public static final int MATCH_ROCKSOLID = 3;
    … …  
    4346    public static final int MATCH_NOMATCH   = 0;
    4447
    45     private     Map<OsmPrimitive, AddressElement> primBestIndex
    46       = new HashMap<> ();
    47     private     Map<AddressElement, OsmPrimitive> elemBestIndex
    48       = new HashMap<> ();
    49 
    50     private     Map<OsmPrimitive,   Map<AddressElement, Integer>> primMatchIndex
    51       = new HashMap<> ();
    52     private     Map<AddressElement, Map<OsmPrimitive,   Integer>> elemMatchIndex
    53       = new HashMap<> ();
     48    private Map<OsmPrimitive, AddressElement> primBestIndex = new HashMap<>();
     49    private Map<AddressElement, OsmPrimitive> elemBestIndex = new HashMap<>();
     50    private Map<OsmPrimitive,   Map<AddressElement, Integer>> primMatchIndex = new HashMap<>();
     51    private Map<AddressElement, Map<OsmPrimitive,   Integer>> elemMatchIndex = new HashMap<>();
    5452
    5553    private Set<OsmPrimitive>   primToUpdate = new HashSet<>();
    5654    private Set<AddressElement> elemToUpdate = new HashSet<>();
     55    // CHECKSTYLE.ON: SingleSpaceSeparator
    5756
    5857    public static Logger logger = Logger.getLogger(Reasoner.class.getName());
    5958
    6059    private Reasoner() {}
     60
    6161    private static Reasoner singleton = null;
    62     public  static Reasoner getInstance() {
     62
     63    public static Reasoner getInstance() {
    6364        if (singleton == null)
    6465            singleton = new Reasoner();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java

    r15585 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.intelligence;
    23
    … …  
    1112public interface ReasonerListener {
    1213
    13     public void elementChanged(AddressElement elem);
    14     public void primitiveChanged(OsmPrimitive prim);
    15     public void resonerReseted();
     14    void elementChanged(AddressElement elem);
    1615
     16    void primitiveChanged(OsmPrimitive prim);
     17
     18    void resonerReseted();
    1719}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.intelligence;
    23
    34import java.util.Collection;
     5
    46import org.openstreetmap.josm.data.SelectionChangedListener;
    57import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    1820 * @author Radomír Černoch, radomir.cernoch@gmail.com
    1921 */
    20 public class SelectionMonitor implements SelectionChangedListener {
     22public final class SelectionMonitor implements SelectionChangedListener {
    2123
    2224    Collection<OsmPrimitive> lastSelection = new NotNullList<>();
    2325
    2426    private SelectionMonitor() {}
     27
    2528    private static SelectionMonitor singleton = null;
    26     public  static SelectionMonitor getInstance() {
     29
     30    public static SelectionMonitor getInstance() {
    2731        if (singleton == null) {
    2832            singleton = new SelectionMonitor();
    … …  
    3236    }
    3337
     38    @Override
    3439    public void selectionChanged(Collection<? extends OsmPrimitive>
    3540                                                                 newSelection) {
    3641        Reasoner r = Reasoner.getInstance();
    3742
    38         synchronized(r) {
     43        synchronized (r) {
    3944            r.openTransaction();
    4045            for (OsmPrimitive selectedPrim :newSelection)

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java

    r30865 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.parser;
    23
    … …  
    1617 * General superclass for any parser capable of filling the database.
    1718 *
     19 * @author Radomír Černoch, raodmir.cernoch@gmail.com
    1820 * @see Database
    19  *
    20  * @author Radomír Černoch, raodmir.cernoch@gmail.com
    2121 */
    2222public abstract class DatabaseParser {
    … …  
    9696
    9797            URL url = new URL(getDatabaseUrl());
    98             HttpURLConnection con = (HttpURLConnection)url.openConnection();
     98            HttpURLConnection con = (HttpURLConnection) url.openConnection();
    9999
    100100            //Set timeout for 30 seconds.
    … …  
    108108            if (con.getResponseCode() != 200)
    109109                throw new DatabaseLoadException(
    110                         "Požadavek na server selhal, číslo chyby: " + String.valueOf( con.getResponseCode() ));
     110                        "Požadavek na server selhal, číslo chyby: " + String.valueOf(con.getResponseCode()));
    111111
    112112            try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(getDatabasePath()))) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java

    r30864 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.parser;
    23
    … …  
    180181    @Override
    181182    public void setDocumentLocator(Locator locator) {}
     183
    182184    @Override
    183185    public void startDocument() throws SAXException {}
     186
    184187    @Override
    185188    public void endDocument() throws SAXException {}
     189
    186190    @Override
    187191    public void startPrefixMapping(String prefix, String uri) throws SAXException {}
     192
    188193    @Override
    189194    public void endPrefixMapping(String prefix) throws SAXException {}
     195
    190196    @Override
    191197    public void characters(char[] ch, int start, int length) throws SAXException {}
     198
    192199    @Override
    193200    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
     201
    194202    @Override
    195203    public void processingInstruction(String target, String data) throws SAXException {}
     204
    196205    @Override
    197206    public void skippedEntity(String name) throws SAXException {}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java

    r30864 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.parser;
    23
    … …  
    1718 * but parsing the actual document must be done by subclasses.</p>
    1819 *
     20 * @author Radomír Černoch, raodmir.cernoch@gmail.com
    1921 * @see Database
    20  *
    21  * @author Radomír Černoch, raodmir.cernoch@gmail.com
    2222 */
    2323public abstract class XMLParser extends DatabaseParser

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/AddKeyValueProposal.java

    r15166 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    34import org.openstreetmap.josm.data.osm.OsmPrimitive;
     5import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
    46
    57/**

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java

    r32453 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    … …  
    2627     * @return true if this proposal is applicable
    2728     */
    28     static public boolean isApplicable(OsmPrimitive primitive) {
     29    public static boolean isApplicable(OsmPrimitive primitive) {
    2930        if (!(primitive instanceof Way))
    3031            return false;
    3132
    32         for (String key : primitive.keySet())
     33        for (String key : primitive.keySet()) {
    3334            if (key.startsWith("addr:"))
    3435                return true;
     36        }
    3537
    3638        return false;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/KeyValueChangeProposal.java

    r15166 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    … …  
    3536            return "Nahradit '" + oldKey + "=" + oldVal + "' za '" + newKey + "=" + newVal + "'";
    3637    }
    37 
    38 
    3938}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/Proposal.java

    r17603 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    … …  
    1617 * @see ExtractAddressIntoNodeProposal
    1718 */
    18 abstract public class Proposal {
     19public abstract class Proposal {
    1920
    2021    /**
    … …  
    3233     */
    3334    @Override
    34     abstract public String toString();
    35 
     35    public abstract String toString();
    3636}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    … …  
    45import java.util.Collection;
    56import java.util.List;
     7
    68import javax.swing.JTree;
    79import javax.swing.ListModel;
    810import javax.swing.event.ListDataEvent;
    911import javax.swing.event.ListDataListener;
     12
    1013import org.openstreetmap.josm.data.osm.OsmPrimitive;
     14import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
    1115import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
    1216

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java

    r30737 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    … …  
    45import java.util.Collection;
    56import java.util.List;
     7
    68import javax.swing.event.TreeModelEvent;
    79import javax.swing.event.TreeModelListener;
    810import javax.swing.tree.TreeModel;
    911import javax.swing.tree.TreePath;
     12
    1013import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1114
    … …  
    4043    /**
    4144     * Adds a new {@link ProposalContainer} to the internal database.
    42      * @param pac
    4345     */
    4446    public void addContainer(ProposalContainer newContainer) {
    … …  
    5153    /**
    5254     * Removes the given {@link ProposalContainer} from the internal list.
    53      * @param containerToAdd
    5455     */
    5556    public void removeContainer(ProposalContainer containerToAdd) {
    … …  
    6869     */
    6970    public ProposalContainer findContainer(OsmPrimitive primitive) {
    70         for (ProposalContainer pac : changeSet)
     71        for (ProposalContainer pac : changeSet) {
    7172            if (pac.getTarget().equals(primitive))
    7273                    return pac;
     74        }
    7375        return null;
    7476    }
    … …  
    7981     * <p>If the primitive is already in the database, the proposal
    8082     * is added to its container. If not, a new container is created.</p>
    81      *
    82      * @param primitive
    83      * @param proposal
    8483     */
    8584    public void addProposals(OsmPrimitive primitive,
    … …  
    133132//==============================================================================
    134133
     134    @Override
    135135    public Object getRoot() {
    136136        return root;
    137137    }
    138138
     139    @Override
    139140    public Object getChild(Object parent, int index) {
    140141        if (parent.equals(root))
    … …  
    147148    }
    148149
     150    @Override
    149151    public int getChildCount(Object parent) {
    150152        if (parent.equals(root))
    … …  
    157159    }
    158160
     161    @Override
    159162    public boolean isLeaf(Object node) {
    160163        if (node.equals(root))
    … …  
    167170    }
    168171
     172    @Override
    169173    public void valueForPathChanged(TreePath path, Object newValue) {
    170174        // We are a read-only model... Nothing to do here.
    171175    }
    172176
     177    @Override
    173178    public int getIndexOfChild(Object parent, Object child) {
    174179        if (parent.equals(root))
    … …  
    181186    }
    182187
     188    @Override
    183189    public void addTreeModelListener(TreeModelListener l) {
    184190        listeners.add(l);
    185191    }
    186192
     193    @Override
    187194    public void removeTreeModelListener(TreeModelListener l) {
    188195        listeners.remove(l);
    … …  
    203210        // If path-length is 2, the whole ProposalContainer is deleted.
    204211        if (path.getPathCount() == 2) {
    205             changeSet.remove((ProposalContainer) path.getPathComponent(1));
     212            changeSet.remove(path.getPathComponent(1));
    206213
    207214            TreeModelEvent event = new TreeModelEvent(this, path);
    … …  
    215222        ProposalContainer ac = (ProposalContainer) path.getPathComponent(1);
    216223        if (path.getPathCount() == 3) {
    217             ac.getProposals().remove((Proposal) path.getPathComponent(2));
     224            ac.getProposals().remove(path.getPathComponent(2));
    218225
    219226            TreeModelEvent event = new TreeModelEvent(this, path);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java

    r15166 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/RemoveKeyProposal.java

    r15166 r32566  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.czechaddress.proposal;
    23
    34import org.openstreetmap.josm.data.osm.OsmPrimitive;
     5import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
    46
    57/**
    … …  
    3941        return "Odstranit atribut '" + key + "'";
    4042    }
    41 
    42 
    4343}
Note: See TracChangeset for help on using the changeset viewer.