Index: /applications/editors/josm/plugins/relcontext/TODO =================================================================== --- /applications/editors/josm/plugins/relcontext/TODO (revision 25694) +++ /applications/editors/josm/plugins/relcontext/TODO (revision 25695) @@ -1,4 +1,3 @@ - Solve width problem for narrows buttons when "fix" and "download" appear simultaneously -- Check all strings to be properly formulated, search for similar ones in josm core and plugins - Draw icons for multipoly settings menu Index: /applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java (revision 25695) @@ -33,9 +33,9 @@ private final static String[] TYPE_KEYS = new String[] { - "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport" + "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement" }; private final static String[] NAMING_TAGS = new String[] { - "name", "place_name", "ref", "note" + "name", "place_name", "ref", "destination", "note" }; Index: /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25695) @@ -3,8 +3,6 @@ import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.command.Command; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStream; -import java.io.Reader; import java.io.InputStreamReader; import java.awt.Point; @@ -46,5 +44,4 @@ import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.GBC; -import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox; Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java (revision 25695) @@ -17,5 +17,5 @@ // putValue(Action.NAME, "X"); putValue(Action.SMALL_ICON, ImageProvider.get("relcontext", "clear")); - putValue(Action.SHORT_DESCRIPTION, tr("Clear chosen relation")); + putValue(Action.SHORT_DESCRIPTION, tr("Clear the chosen relation")); this.rel = rel; rel.addChosenRelationListener(this); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java (revision 25695) @@ -287,5 +287,5 @@ panel.add(new JLabel(tr("Admin level")), GBC.std()); panel.add(Box.createHorizontalStrut(10), GBC.std()); - panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL)); + panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5)); final JTextField name = new JTextField(); @@ -301,5 +301,5 @@ } }; - final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation")); + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation")); dlg.setModalityType(ModalityType.DOCUMENT_MODAL); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25695) @@ -32,5 +32,4 @@ */ public class CreateRelationAction extends JosmAction { - private static final String ACTION_NAME = "Create relation"; private static final String PREF_LASTTYPE = "reltoolbox.createrelation.lasttype"; protected ChosenRelation chRel; @@ -87,5 +86,5 @@ private String askForType() { JPanel panel = new JPanel(new GridBagLayout()); - panel.add(new JLabel(tr("Choose type for the new relation:")), GBC.eol().insets(0, 0, 0, 5)); + panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5)); final AutoCompletingComboBox keys = new AutoCompletingComboBox(); @@ -105,5 +104,5 @@ } }; - final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation")); + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation")); dlg.setModalityType(ModalityType.DOCUMENT_MODAL); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java (revision 25695) @@ -15,5 +15,5 @@ public DeleteChosenRelationAction( ChosenRelation rel ) { - super(tr("Delete relation")); + super(tr("Delete the chosen relation")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); this.rel = rel; Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadChosenRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadChosenRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadChosenRelationAction.java (revision 25695) @@ -29,5 +29,5 @@ // putValue(NAME, "D"); putValue(SMALL_ICON, ImageProvider.get("relcontext", "download")); - putValue(SHORT_DESCRIPTION, tr("Download all incomplete members for chosen relation")); + putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation")); this.rel = rel; rel.addChosenRelationListener(this); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java (revision 25695) @@ -29,7 +29,7 @@ public DownloadParentsAction( ChosenRelation rel ) { - super(tr("Download all referrers")); + super(tr("Download referrers")); putValue(SMALL_ICON, ImageProvider.get("downloadreferrers")); - putValue(SHORT_DESCRIPTION, tr("Download referrers for the relation and its members")); + putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members")); this.rel = rel; rel.addChosenRelationListener(this); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java (revision 25695) @@ -23,5 +23,5 @@ // putValue(NAME, "E"); putValue(SMALL_ICON, ImageProvider.get("dialogs/mappaint", "pencil")); - putValue(SHORT_DESCRIPTION, tr("Open relation editor for chosen relation")); + putValue(SHORT_DESCRIPTION, tr("Open relation editor for the chosen relation")); this.rel = rel; rel.addChosenRelationListener(this); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java (revision 25695) @@ -48,5 +48,5 @@ } }; - final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find relation")); + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find a relation")); dlg.setModalityType(ModalityType.DOCUMENT_MODAL); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java (revision 25694) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java (revision 25695) @@ -22,5 +22,5 @@ public RelationHelpAction( ChosenRelation rel ) { super(); - putValue(NAME, tr("Relation wiki page")); + putValue(NAME, tr("Open relation wiki page")); putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); @@ -28,4 +28,8 @@ rel.addChosenRelationListener(this); setEnabled(false); + } + + public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) { + setEnabled(newRelation != null); } @@ -97,7 +101,3 @@ } } - - public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) { - setEnabled(newRelation != null); - } }