Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java (revision 15585) @@ -20,5 +20,8 @@ public abstract class MapUtils { - static final double NODE_ZOOM_LEVEL = 0.00000007; + /** + * Zoom level used for zooming to a single node. + */ + public static final double NODE_ZOOM_LEVEL = 0.00000007; Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java (revision 15585) @@ -31,4 +31,7 @@ } + /** + * Checks each item and if it isn't {@code null}, it is added. + */ @Override public boolean addAll(Collection c) { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 15585) @@ -27,7 +27,9 @@ KEY_ADDR_STREET, KEY_ADDR_CO, KEY_ADDR_CP }; + /** + * Comparator for {@link OsmPrimitive}, which looks at 'addr:*' tags. + */ public static final Comparator comparator = new Comparator() { - public int compare(OsmPrimitive o1, OsmPrimitive o2) { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java (revision 15585) @@ -3,5 +3,4 @@ import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Database; -import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner; /** Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (revision 15585) @@ -8,6 +8,9 @@ /** + * Shows the manager window for editing the database. * * @author Radomír Černoch, radomir.cernoch@gmail.com + * + * @see ManagerDialog */ public class ManagerAction extends JosmAction { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15585) @@ -13,5 +13,5 @@ * The most general element of the houses and streets database. * - *

Every element must hav a name and may have a parent element.

+ *

Every element must have a name and may have a parent.

* * @author Radomír Černoch radomir.cernoch@gmail.com @@ -193,4 +193,10 @@ } + /** + * Does the same as {@code matchField()}, but allows the string to contain + * abbreviations. + * + *

For detailed description see {@code matchField()}.

+ */ public static int matchFieldAbbrev(String elemValue, String primValue) { @@ -212,8 +218,17 @@ } + /** + * Makes the given primitive have the same key-values as the current element. + */ public List getDiff(OsmPrimitive prim) { return null; } + /** + * Returns the "quality" of a element-primitive match. + * + *

Returns a value from {@link Reasoner}{@code .MATCH_*}, which + * describes how well does the given primitive match to this element.

+ */ public int getQ(OsmPrimitive primitive) { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java (revision 15585) @@ -2,14 +2,16 @@ import java.util.ArrayList; +import org.openstreetmap.josm.plugins.czechaddress.parser.DatabaseParser; /** - * Stores the whole database of all regions, municipalities, suburbs, streets - * and houses in the Czech republic. The database can be feeded via - * XML and is capable of downloading it from www.mvcr.cz + * Stores the whole database. + * + *

Contains the tree of all regions, municipalities, suburbs, streets + * and houses in the Czech republic.

* * @see AddressElement * @see DatabaseParser - * @author Radomir Cernoch radomir.cernoch@gmail.com + * @author Radomír Černoch radomir.cernoch@gmail.com */ public class Database { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java (revision 15585) @@ -1,7 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.openstreetmap.josm.plugins.czechaddress.addressdatabase; Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (revision 15585) @@ -200,4 +200,7 @@ } + /** + * Determies whether the given primitive can be matched to a House. + */ public static boolean isMatchable(OsmPrimitive prim) { for (String key : prim.keySet()) Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java (revision 15585) @@ -1,10 +1,6 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.openstreetmap.josm.plugins.czechaddress.addressdatabase; /** + * Disassemles the parent->parent... branch of an AddressElement. * * @author Radomír Černoch, radomir.cernoch@gmail.com @@ -40,4 +36,7 @@ } + /** + * Returns the value for the 'is_in=*' tag. + */ public String getIsIn() { String result = ""; Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (revision 15585) @@ -2,5 +2,4 @@ import java.util.ArrayList; -import org.openstreetmap.josm.data.osm.OsmPrimitive; /** Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (revision 15585) @@ -1,6 +1,4 @@ package org.openstreetmap.josm.plugins.czechaddress.gui; -import java.awt.Component; -import java.awt.Font; import java.util.ArrayList; import java.util.Collections; @@ -12,5 +10,4 @@ import javax.swing.ComboBoxModel; import javax.swing.DefaultComboBoxModel; -import javax.swing.JList; import javax.swing.event.ListDataListener; import javax.swing.Icon; @@ -24,5 +21,4 @@ import org.openstreetmap.josm.plugins.czechaddress.PrimUtils; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; -import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.ElementWithHouses; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.House; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street; @@ -33,5 +29,5 @@ /** - * Dialog for displaying and handling getConflicts. + * Dialog for displaying and handling conflicts. * * @author Radomír Černoch, radomir.cernoch@gmail.com @@ -57,6 +53,4 @@ mainField.setModel(conflictModel); -// conflictModel.addListDataListener(mainField); - Reasoner.getInstance().addListener(new ReasonerHook()); @@ -297,4 +291,7 @@ //============================================================================== + /** + * Listenes to the {@link Reasoner} and updates data models. + */ private class ReasonerHook implements ReasonerListener { @@ -567,122 +564,3 @@ } } - - private class CandidatesRenderer extends UniversalListRenderer { - - @Override - public Component getListCellRendererComponent(JList list, Object value, - int index, boolean isSelected, boolean cellHasFocus) { - Component c = super.getListCellRendererComponent(list, value, index, - isSelected, cellHasFocus); - - if ( (value instanceof AddressElement && - Reasoner.getInstance().translate((AddressElement) value) != null) - || (value instanceof OsmPrimitive && - Reasoner.getInstance().translate((OsmPrimitive) value) != null) ) - setFont(getFont().deriveFont(Font.BOLD)); - - return c; - } - } - -/* - private class ElemTreeModel extends HalfCookedTreeModel { - - public ElemTreeModel() { - root = "Konflikty podle objektů v databázi"; - } - - public Object getChild(Object parent, int index) { - try { - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) - return r.getElementsInConflict().get(index); - - if (parent instanceof AddressElement) - return r.getConflicts((AddressElement) parent).get(index).prim; - - } catch (Exception e) { } - return null; - } - - public int getChildCount(Object parent) { - try { - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) - return r.getElementsInConflict().size(); - - if (parent instanceof AddressElement) - return r.getConflicts((AddressElement) parent).size(); - - } catch (Exception exp) { } - return 0; - } - - public int getIndexOfChild(Object parent, Object child) { - try{ - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) - return r.getElementsInConflict().indexOf(child); - - if (parent instanceof AddressElement) - return r.getConflicts((AddressElement) parent).indexOf(child); - - } catch (Exception exp) { } - return -1; - } - } - - - private class PrimTreeModel extends HalfCookedTreeModel { - - public PrimTreeModel() { - root = "Podle objeků databáze"; - } - - public Object getChild(Object parent, int index) { - try { - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) - return r.getPrimitivesInConflict().get(index); - - if (parent instanceof OsmPrimitive) - return r.getConflictsconflictsve) parent).get(index).elem; - - } catch (Exception exp) { } - return null; - } - - public int getChildCount(Object parent) { - - try { - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) - return r.getPrimitivesInConflict().size(); - if (parent instanceof OsmPrimitive) - return r.getConflictsconflictsve) parent).size(); - - } catch (Exception exp) { } - return 0; - } - - public int getIndexOfChild(Object parent, Object child) { - - try { - Reasoner r = CzechAddressPlugin.getReasoner(); - - if (parent == root) { - return r.getPrimitivesInConflict().indexOf(child); - - } else if (parent instanceof OsmPrimitive) - return r.getConflictsconflictsve) parent).indexOf(child); - - } catch (Exception exp) { } - return -1; - } - }*/ } Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java (revision 15585) @@ -1,4 +1,6 @@ package org.openstreetmap.josm.plugins.czechaddress.gui; +import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedListModel; +import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel; import org.openstreetmap.josm.plugins.czechaddress.StringUtils; import java.awt.Component; Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java (revision 15585) @@ -10,5 +10,4 @@ import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin; -import org.openstreetmap.josm.plugins.czechaddress.StatusListener; import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner; import org.openstreetmap.josm.plugins.czechaddress.intelligence.ReasonerListener; @@ -21,6 +20,6 @@ * proposals, delete or confirm them. * - * Apart from proposals, it also shows a list of conflicts, which arouse - * during the address completion. + *

Apart from proposals, it also shows a list of conflicts, which arouse + * during the address completion.

* * @author Radomír Černoch radomir.cernoch@gmail.com Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedComboBoxModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedComboBoxModel.java (revision 15584) +++ (revision ) @@ -1,37 +1,0 @@ -package org.openstreetmap.josm.plugins.czechaddress.gui; - -import java.util.ArrayList; -import java.util.List; -import javax.swing.ComboBoxModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; - -/** - * Class for shorter and faster implementations of {@link ComboBoxModel}s. - * - *

This creates a list of {@link ListDataListener}s and implements - * method for adding and removing them. Moreover it allows to notify all - * listeners with the generic message {@code CONTENT_CHANGED}.

- * - * @author Radomír Černoch, radomir.cernoch@gmail.com - */ -public abstract class HalfCookedComboBoxModel implements ComboBoxModel { - - List listeners = new ArrayList(); - - public void addListDataListener(ListDataListener l) { - listeners.add(l); - } - - public void removeListDataListener(ListDataListener l) { - listeners.remove(l); - } - - public void notifyAllListeners() { - ListDataEvent evt = new ListDataEvent(this, - ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); - - for (ListDataListener l : listeners) - l.contentsChanged(evt); - } -} Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedListModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedListModel.java (revision 15584) +++ (revision ) @@ -1,37 +1,0 @@ -package org.openstreetmap.josm.plugins.czechaddress.gui; - -import java.util.ArrayList; -import java.util.List; -import javax.swing.ListModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; - -/** - * Class for shorter and faster implementations of {@link ListModel}s. - * - *

This creates a list of {@link ListDataListener}s and implements - * method for adding and removing them. Moreover it allows to notify all - * listeners with the generic message {@code CONTENT_CHANGED}.

- * - * @author Radomír Černoch, radomir.cernoch@gmail.com - */ -public abstract class HalfCookedListModel implements ListModel { - - List listeners = new ArrayList(); - - public void addListDataListener(ListDataListener l) { - listeners.add(l); - } - - public void removeListDataListener(ListDataListener l) { - listeners.remove(l); - } - - public void notifyAllListeners() { - ListDataEvent evt = new ListDataEvent(this, - ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); - - for (ListDataListener l : listeners) - l.contentsChanged(evt); - } -} Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedTreeModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/HalfCookedTreeModel.java (revision 15584) +++ (revision ) @@ -1,51 +1,0 @@ -package org.openstreetmap.josm.plugins.czechaddress.gui; - -import java.util.ArrayList; -import java.util.List; -import javax.swing.event.TreeModelEvent; -import javax.swing.event.TreeModelListener; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - -/** - * Class for shorter and faster implementations of {@link TreeModel}s. - * - *

This creates a list of {@link TreeModelListener}s and implements - * method for adding and removing them. Moreover it allows to notify all - * listeners with the generic message telling that the whole tree - * has changed.

- * - * @author Radomír Černoch, radomir.cernoch@gmail.com - */ -public abstract class HalfCookedTreeModel implements TreeModel { - - List listeneres = new ArrayList(); - - protected String root; - public Object getRoot() { - return root; - } - - public void addTreeModelListener(TreeModelListener l) { - listeneres.add(l); - } - - public void removeTreeModelListener(TreeModelListener l) { - listeneres.remove(l); - } - - public boolean isLeaf(Object node) { - return getChildCount(node) == 0; - } - - public void valueForPathChanged(TreePath path, Object newValue) { - - } - - public void notifyAllListeners() { - TreeModelEvent evt = new TreeModelEvent(this, new Object[] {root}); - - for (TreeModelListener l : listeneres) - l.treeNodesChanged(evt); - } -} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (revision 15585) @@ -66,4 +66,6 @@ /** + * Hardly ever working method for autodetecting the current location. + * * @deprecated */ Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java (revision 15585) @@ -1,15 +1,10 @@ package org.openstreetmap.josm.plugins.czechaddress.gui; -import java.awt.Component; -import java.awt.event.MouseEvent; +import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedTreeModel; import java.util.ArrayList; import java.util.List; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; -import javax.swing.JTable; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableModel; -import org.openstreetmap.josm.plugins.czechaddress.gui.utils.UniversalTreeRenderer; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.ExtendedDialog; @@ -23,7 +18,16 @@ import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.ViToCi; import org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors.StreetEditor; +import org.openstreetmap.josm.plugins.czechaddress.gui.utils.UniversalTreeRenderer; import org.openstreetmap.josm.plugins.czechaddress.intelligence.Capitalizator; import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner; +/** + * Editing the database of {@link AddressElement}s. + * + *

Currently allows to display the current location + its children and + * automatic street renaming.

+ * + * @author Radomír Černoch radomir.cernoch@gmail.com + */ public class ManagerDialog extends ExtendedDialog { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 15585) @@ -1,4 +1,5 @@ package org.openstreetmap.josm.plugins.czechaddress.gui; +import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -22,5 +23,4 @@ import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal; import org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalContainer; -import org.openstreetmap.josm.tools.ImageProvider; /** Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/Renamer.form =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/Renamer.form (revision 15584) +++ (revision ) @@ -1,99 +1,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <Editor/> - <Renderer/> - </Column> - <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="false"> - <Title/> - <Editor/> - <Renderer/> - </Column> - </TableColumnModel> - </Property> - <Property name="columnSelectionAllowed" type="boolean" value="true"/> - <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor"> - <TableHeader reorderingAllowed="true" resizingAllowed="true"/> - </Property> - </Properties> - </Component> - </SubComponents> - </Container> - </SubComponents> - </Container> - </SubComponents> - </Container> - </SubComponents> -</Form> Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/Renamer.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/Renamer.java (revision 15584) +++ (revision ) @@ -1,220 +1,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -/* - * Renamer.java - * - * Created on 24.5.2009, 18:03:35 - */ - -package org.openstreetmap.josm.plugins.czechaddress.gui; - -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.List; -import javax.swing.event.TableModelListener; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableModel; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin; -import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; -import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street; -import org.openstreetmap.josm.plugins.czechaddress.intelligence.Capitalizator; - -/** - * - * @author radek - */ -public class Renamer extends ExtendedDialog { - - StreetModel<Street> streetModel = new StreetModel<Street>(); - - /** Creates new form Renamer */ - public Renamer() { - - super(Main.parent, "Upravit databázi", - new String[] { "OK", "Zrušit"}, true); - initComponents(); - - Capitalizator cap = new Capitalizator( - Main.ds.allPrimitives(), - CzechAddressPlugin.getLocation().getStreets()); - - for (Street capStreet : cap.getCapitalised()) { - assert cap.translate(capStreet).get("name") != null : capStreet; - - String elemName = capStreet.getName(); - String primName = cap.translate(capStreet).get("name"); - - if (!elemName.equals(primName)) { - streetModel.elems.add(capStreet); - streetModel.names.add(primName); - } - } - - streetTable.setModel(streetModel); - streetTable.setDefaultRenderer( AddressElement.class, - new AddressElementRenderer()); - - // And finalize initializing the form. - setupDialog(mainPanel, new String[] { "ok.png", "cancel.png" }); - } - - @Override - protected void buttonAction(ActionEvent evt) { - super.buttonAction(evt); - - if (getValue() == 1) { - assert streetModel.elems.size() == streetModel.names.size(); - - for(int i=0; i<streetModel.elems.size(); i++) - streetModel.elems.get(i).setName(streetModel.names.get(i)); - } - - setVisible(false); - } - - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents - private void initComponents() { - - mainPanel = new javax.swing.JPanel(); - tabbedPane = new javax.swing.JTabbedPane(); - streetScrollPane = new javax.swing.JScrollPane(); - streetTable = new javax.swing.JTable(); - - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - getContentPane().setLayout(new java.awt.GridLayout(1, 0)); - - streetTable.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {null, null}, - {null, null}, - {null, null}, - {null, null} - }, - new String [] { - "Původní název", "Návrh z mapy" - } - ) { - Class[] types = new Class [] { - java.lang.Object.class, java.lang.String.class - }; - boolean[] canEdit = new boolean [] { - false, true - }; - - public Class getColumnClass(int columnIndex) { - return types [columnIndex]; - } - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return canEdit [columnIndex]; - } - }); - streetTable.setColumnSelectionAllowed(true); - streetScrollPane.setViewportView(streetTable); - streetTable.getColumnModel().getSelectionModel().setSelectionMode(javax.swing.ListSelectionModel.SINGLE_INTERVAL_SELECTION); - streetTable.getColumnModel().getColumn(1).setResizable(false); - - tabbedPane.addTab("Ulice", streetScrollPane); - - javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel); - mainPanel.setLayout(mainPanelLayout); - mainPanelLayout.setHorizontalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 476, Short.MAX_VALUE) - ); - mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(mainPanelLayout.createSequentialGroup() - .addComponent(tabbedPane, javax.swing.GroupLayout.PREFERRED_SIZE, 289, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(25, Short.MAX_VALUE)) - ); - - getContentPane().add(mainPanel); - - pack(); - }// </editor-fold>//GEN-END:initComponents - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel mainPanel; - private javax.swing.JScrollPane streetScrollPane; - private javax.swing.JTable streetTable; - private javax.swing.JTabbedPane tabbedPane; - // End of variables declaration//GEN-END:variables - - private class AddressElementRenderer extends DefaultTableCellRenderer { - - public AddressElementRenderer() {} - - @Override - protected void setValue(Object value) { - super.setValue(value); - - if (value instanceof AddressElement) - setText(((AddressElement) value).getName() ); - } - } - - private class StreetModel<Element> implements TableModel { - - List<Element> elems = new ArrayList<Element>(); - List<String> names = new ArrayList<String>(); - - public int getRowCount() { - assert elems.size() == names.size(); - return elems.size(); - } - - public int getColumnCount() { - return 2; - } - - public String getColumnName(int columnIndex) { - if (columnIndex == 0) return "Původní název"; - if (columnIndex == 1) return "Navržený název"; - assert false : columnIndex; - return null; - } - - public Class<?> getColumnClass(int columnIndex) { - if (columnIndex == 0) return AddressElement.class; - if (columnIndex == 1) return String.class; - assert false : columnIndex; - return null; - } - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return columnIndex == 1; - } - - public Object getValueAt(int rowIndex, int columnIndex) { - if (columnIndex == 0) return elems.get(rowIndex); - if (columnIndex == 1) return names.get(rowIndex); - assert false : columnIndex; - return null; - } - - public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - assert columnIndex == 1; - names.set(rowIndex, (String) aValue); - } - - public void addTableModelListener(TableModelListener l) { - - } - - public void removeTableModelListener(TableModelListener l) { - - } - } -} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form (revision 15585) @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8" ?> -<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> +<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="2"/> + </SyntheticProperties> <AuxValues> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 15585) @@ -1,13 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -/* - * StreetEditor.java - * - * Created on 3.6.2009, 20:50:45 - */ - package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors; @@ -20,6 +9,7 @@ /** + * Dialog for editing a {@link Street} * - * @author radek + * @author Radomír Černoch radomir.cernoch@gmail.com */ public class StreetEditor extends ExtendedDialog { Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java (revision 15585) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java (revision 15585) @@ -0,0 +1,37 @@ +package org.openstreetmap.josm.plugins.czechaddress.gui.utils; + +import java.util.ArrayList; +import java.util.List; +import javax.swing.ComboBoxModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; + +/** + * Class for shorter and faster implementations of {@link ComboBoxModel}s. + * + * <p>This creates a list of {@link ListDataListener}s and implements + * method for adding and removing them. Moreover it allows to notify all + * listeners with the generic message {@code CONTENT_CHANGED}.</p> + * + * @author Radomír Černoch, radomir.cernoch@gmail.com + */ +public abstract class HalfCookedComboBoxModel implements ComboBoxModel { + + List<ListDataListener> listeners = new ArrayList<ListDataListener>(); + + public void addListDataListener(ListDataListener l) { + listeners.add(l); + } + + public void removeListDataListener(ListDataListener l) { + listeners.remove(l); + } + + public void notifyAllListeners() { + ListDataEvent evt = new ListDataEvent(this, + ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); + + for (ListDataListener l : listeners) + l.contentsChanged(evt); + } +} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java (revision 15585) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java (revision 15585) @@ -0,0 +1,37 @@ +package org.openstreetmap.josm.plugins.czechaddress.gui.utils; + +import java.util.ArrayList; +import java.util.List; +import javax.swing.ListModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; + +/** + * Class for shorter and faster implementations of {@link ListModel}s. + * + * <p>This creates a list of {@link ListDataListener}s and implements + * method for adding and removing them. Moreover it allows to notify all + * listeners with the generic message {@code CONTENT_CHANGED}.</p> + * + * @author Radomír Černoch, radomir.cernoch@gmail.com + */ +public abstract class HalfCookedListModel implements ListModel { + + List<ListDataListener> listeners = new ArrayList<ListDataListener>(); + + public void addListDataListener(ListDataListener l) { + listeners.add(l); + } + + public void removeListDataListener(ListDataListener l) { + listeners.remove(l); + } + + public void notifyAllListeners() { + ListDataEvent evt = new ListDataEvent(this, + ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); + + for (ListDataListener l : listeners) + l.contentsChanged(evt); + } +} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java (revision 15585) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java (revision 15585) @@ -0,0 +1,51 @@ +package org.openstreetmap.josm.plugins.czechaddress.gui.utils; + +import java.util.ArrayList; +import java.util.List; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; + +/** + * Class for shorter and faster implementations of {@link TreeModel}s. + * + * <p>This creates a list of {@link TreeModelListener}s and implements + * method for adding and removing them. Moreover it allows to notify all + * listeners with the generic message telling that the whole tree + * has changed.</p> + * + * @author Radomír Černoch, radomir.cernoch@gmail.com + */ +public abstract class HalfCookedTreeModel implements TreeModel { + + List<TreeModelListener> listeneres = new ArrayList<TreeModelListener>(); + + protected String root; + public Object getRoot() { + return root; + } + + public void addTreeModelListener(TreeModelListener l) { + listeneres.add(l); + } + + public void removeTreeModelListener(TreeModelListener l) { + listeneres.remove(l); + } + + public boolean isLeaf(Object node) { + return getChildCount(node) == 0; + } + + public void valueForPathChanged(TreePath path, Object newValue) { + + } + + public void notifyAllListeners() { + TreeModelEvent evt = new TreeModelEvent(this, new Object[] {root}); + + for (TreeModelListener l : listeneres) + l.treeNodesChanged(evt); + } +} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java (revision 15585) @@ -1,7 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.openstreetmap.josm.plugins.czechaddress.gui.utils; @@ -11,4 +6,5 @@ /** + * List renderer for AddressElements and OsmPrimitives. * * @author Radomír Černoch, radomir.cernoch@gmail.com Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java (revision 15585) @@ -1,7 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.openstreetmap.josm.plugins.czechaddress.gui.utils; @@ -21,4 +16,5 @@ /** + * Helper for getting icons and texts for {@code Universal*} renderers. * * @author Radomír Černoch, radomir.cernoch@gmail.com @@ -31,5 +27,4 @@ private static final ImageIcon nodeIcon = ImageProvider.get("data/node.png"); private static final ImageIcon wayIcon = ImageProvider.get("data/way.png"); -// private static final ImageIcon closedWayIcon = ImageProvider.get("Mf_closedway.png"); private static final ImageIcon relationIcon = ImageProvider.get("data/relation.png"); Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java (revision 15585) @@ -6,5 +6,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; -import org.openstreetmap.josm.plugins.czechaddress.gui.utils.UniversalRenderer; /** Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java (revision 15585) @@ -5,4 +5,5 @@ /** + * Interface capable of sensing changes in the {@link Reasoner}. * * @author Radomír Černoch, radomir.cernoch@gmail.com Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java (revision 15585) @@ -10,5 +10,5 @@ /** - * Listenes to the current selection for reasoning + * Listenes to the current selection and updates all selected elements. * * <p>Currently JOSM has no way of giving notice about a changed or deleted Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java (revision 15584) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java (revision 15585) @@ -1,5 +1,4 @@ package org.openstreetmap.josm.plugins.czechaddress.parser; -import org.openstreetmap.josm.plugins.czechaddress.parser.DatabaseParser; import java.io.IOException; import org.openstreetmap.josm.plugins.czechaddress.DatabaseLoadException; Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalListPainter.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalListPainter.java (revision 15584) +++ (revision ) @@ -1,38 +1,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.openstreetmap.josm.plugins.czechaddress.proposal; - -import java.awt.Component; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JList; -import org.openstreetmap.josm.tools.ImageProvider; - -/** - * - * @author radek - */ -public class ProposalListPainter extends DefaultListCellRenderer { - - Icon iconAdd = ImageProvider.get("actions", "add.png"); - Icon iconEdit = ImageProvider.get("actions", "edit.png"); - Icon iconRemove = ImageProvider.get("actions", "remove.png"); - - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - - setIcon(null); - - if (value instanceof AddKeyValueProposal) setIcon(iconAdd); - else if (value instanceof KeyValueChangeProposal) setIcon(iconEdit); - else if (value instanceof RemoveKeyProposal) setIcon(iconRemove); - - return c; - } - - -}