Changeset 3995 in josm for trunk


Ignore:
Timestamp:
2011-03-20T01:29:48+01:00 (13 years ago)
Author:
mjulius
Message:

fix #3590 - Primitives or objects: Pick one

Location:
trunk/src/org/openstreetmap/josm
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

    r3443 r3995  
    4242        String ret =  pattern.matcher(baseUrl).replaceAll("/browse");
    4343        if (ret.equals(baseUrl)) {
    44             System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to info or history page for OSM primitive will probably fail. API base URL is: ''{0}''",baseUrl));
     44            System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
    4545        }
    4646        if (ret.startsWith("http://api.openstreetmap.org/")) {

  • trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

    r3757 r3995  
    2727
    2828    public DownloadReferrersAction() {
    29         super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download primitives referring to one of the selected primitives"),
     29        super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download objects referring to one of the selected objects"),
    3030                Shortcut.registerShortcut("file:downloadreferrers", tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY), true);
    3131        putValue("help", ht("/Action/DownloadReferrers"));

  • trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

    r3754 r3995  
    2020public class MergeSelectionAction extends AbstractMergeAction {
    2121    public MergeSelectionAction() {
    22         super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected primitives into another layer"), Shortcut
     22        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"), Shortcut
    2323                .registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")), KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
    2424                true /* register */

  • trunk/src/org/openstreetmap/josm/actions/PasteAction.java

    r3384 r3995  
    2020import org.openstreetmap.josm.data.osm.PrimitiveData;
    2121import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
     22import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
    2223import org.openstreetmap.josm.data.osm.RelationData;
    2324import org.openstreetmap.josm.data.osm.RelationMemberData;
    2425import org.openstreetmap.josm.data.osm.WayData;
    25 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
    2626import org.openstreetmap.josm.gui.ExtendedDialog;
    2727import org.openstreetmap.josm.gui.layer.Layer;
    … …  
    154154                new String[] {tr("Paste without incomplete members"), tr("Cancel")});
    155155        ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers.png", "cancel.png"});
    156         ed.setContent(tr("The copied data contains incomplete primitives.  "
    157                 + "When pasting the incomplete primitives are removed.  "
    158                 + "Do you want to paste the data without the incomplete primitives?"));
     156        ed.setContent(tr("The copied data contains incomplete objects.  "
     157                + "When pasting the incomplete objects are removed.  "
     158                + "Do you want to paste the data without the incomplete objects?"));
    159159        ed.showDialog();
    160160        return ed.getValue() == 1;

  • trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java

    r3640 r3995  
    254254        if (!commands.isEmpty()) {
    255255            String title1 = trn("Pasting {0} tag", "Pasting {0} tags", commands.size(), commands.size());
    256             String title2 = trn("to {0} primitive", "to {0} primtives", selection.size(), selection.size());
     256            String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
    257257            Main.main.undoRedo.add(
    258258                    new SequenceCommand(

  • trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java

    r3262 r3995  
    2828        JOptionPane.showMessageDialog(
    2929                Main.parent,
    30                 tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
     30                tr("<html>Layer ''{0}'' already has a conflict for object<br>"
    3131                        + "''{1}''.<br>"
    3232                        + "This conflict cannot be added.</html>",
    … …  
    5050    @Override public void undoCommand() {
    5151        if (! Main.map.mapView.hasLayer(getLayer())) {
    52             System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for primitive ''{1}''.",
     52            System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
    5353                    getLayer().getName(),
    5454                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    … …  
    6565    @Override public JLabel getDescription() {
    6666        return new JLabel(
    67                         tr("Add conflict for ''{0}''",
    68                                 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    69                         ),
    70                         ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
    71                         JLabel.HORIZONTAL
     67                tr("Add conflict for ''{0}''",
     68                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
     69                ),
     70                ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
     71                JLabel.HORIZONTAL
    7272        );
    7373    }

  • trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

    r3362 r3995  
    6363    @Override public JLabel getDescription() {
    6464        return new JLabel(
    65                         trn("Undelete {0} primitive", "Undelete {0} primitives", toUndelete.size(), toUndelete.size()),
    66                         ImageProvider.get("data", "object"),
    67                         JLabel.HORIZONTAL
     65                trn("Undelete {0} object", "Undelete {0} objects", toUndelete.size(), toUndelete.size()),
     66                ImageProvider.get("data", "object"),
     67                JLabel.HORIZONTAL
    6868        );
    6969    }

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r3766 r3995  
    323323        StringBuffer sb = new StringBuffer();
    324324        sb.append("<html>");
    325         sb.append(tr("The following primitives could not be copied to the target primitive<br>because they are deleted in the target dataset:"));
     325        sb.append(tr("The following objects could not be copied to the target object<br>because they are deleted in the target dataset:"));
    326326        sb.append("<ul>");
    327327        for (String item: items) {
    … …  
    333333                Main.parent,
    334334                sb.toString(),
    335                 tr("Merging deleted primitives failed"),
     335                tr("Merging deleted objects failed"),
    336336                JOptionPane.WARNING_MESSAGE,
    337337                HelpUtil.ht("/Dialog/Conflict#MergingDeletedPrimitivesFailed")

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r3776 r3995  
    55import static org.openstreetmap.josm.tools.I18n.trn;
    66
     7import java.awt.BorderLayout;
    78import java.awt.Component;
    8 import java.awt.BorderLayout;
    99import java.awt.event.ActionEvent;
    1010import java.awt.event.KeyEvent;
    … …  
    2626
    2727import javax.swing.AbstractAction;
     28import javax.swing.ImageIcon;
     29import javax.swing.JLabel;
    2830import javax.swing.JOptionPane;
    2931import javax.swing.JPanel;
    3032import javax.swing.JScrollPane;
    3133import javax.swing.JTable;
    32 import javax.swing.JLabel;
    3334import javax.swing.ListSelectionModel;
    34 import javax.swing.table.DefaultTableCellRenderer;
    35 import javax.swing.table.TableColumnModel;
    3635import javax.swing.event.ListSelectionEvent;
    3736import javax.swing.event.ListSelectionListener;
     37import javax.swing.table.DefaultTableCellRenderer;
    3838import javax.swing.table.DefaultTableModel;
     39import javax.swing.table.TableColumnModel;
    3940
    4041import org.openstreetmap.josm.Main;
    … …  
    5051import org.openstreetmap.josm.tools.ImageProvider;
    5152import org.openstreetmap.josm.tools.Shortcut;
    52 import org.openstreetmap.josm.tools.ImageProvider;
    53 import javax.swing.ImageIcon;
    5453
    5554/**
    … …  
    118117        columnModel.getColumn(3).setPreferredWidth(20);
    119118        columnModel.getColumn(3).setCellRenderer(new DefaultTableCellRenderer() {
     119            @Override
    120120            public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
    121121                final JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
    … …  
    179179        public SelectUsersPrimitivesAction() {
    180180            putValue(NAME, tr("Select"));
    181             putValue(SHORT_DESCRIPTION, tr("Select primitives submitted by this user"));
     181            putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user"));
    182182            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
    183183            updateEnabledState();
    … …  
    281281            Layer layer = Main.main.getActiveLayer();
    282282            if (layer instanceof OsmDataLayer) {
    283                refresh(((OsmDataLayer)layer).data.getSelected());
     283                refresh(((OsmDataLayer)layer).data.getSelected());
    284284            }
    285285            setEnabled(false);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

    r3479 r3995  
    248248            putValue(NAME, tr("Show history"));
    249249            putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
    250             putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected primitives"));
     250            putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected objects"));
    251251            updateEnabledState();
    252252        }
    … …  
    377377            putValue(NAME, tr("Zoom to in layer"));
    378378            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
    379             putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding primitives in the current data layer"));
     379            putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding objects in the current data layer"));
    380380            updateEnabledState();
    381381        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r3206 r3995  
    415415            putValue(NAME, tr("Zoom to in layer"));
    416416            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
    417             putValue(SHORT_DESCRIPTION, tr("Zoom to the primitives in the content of this changeset in the current data layer"));
     417            putValue(SHORT_DESCRIPTION, tr("Zoom to the objects in the content of this changeset in the current data layer"));
    418418            updateEnabledState();
    419419        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r3920 r3995  
    670670        protected boolean confirmAddingPrimtive(OsmPrimitive primitive)  throws AddAbortException {
    671671            String msg = tr("<html>This relation already has one or more members referring to<br>"
    672                     + "the primitive ''{0}''<br>"
     672                    + "the object ''{0}''<br>"
    673673                    + "<br>"
    674674                    + "Do you really want to add another relation member?</html>",
    … …  
    679679                    Main.parent,
    680680                    msg,
    681                     tr("Multiple members referring to same primitive"),
     681                    tr("Multiple members referring to same object."),
    682682                    JOptionPane.YES_NO_CANCEL_OPTION,
    683683                    JOptionPane.WARNING_MESSAGE,
    … …  
    738738        public AddSelectedAtStartAction() {
    739739            putValue(SHORT_DESCRIPTION,
    740                     tr("Add all primitives selected in the current dataset before the first member"));
     740                    tr("Add all objects selected in the current dataset before the first member"));
    741741            putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copystartright"));
    742742            // putValue(NAME, tr("Add Selected"));
    … …  
    764764    class AddSelectedAtEndAction extends AddFromSelectionAction implements TableModelListener {
    765765        public AddSelectedAtEndAction() {
    766             putValue(SHORT_DESCRIPTION, tr("Add all primitives selected in the current dataset after the last member"));
     766            putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
    767767            putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright"));
    768768            // putValue(NAME, tr("Add Selected"));
    … …  
    791791        public AddSelectedBeforeSelection() {
    792792            putValue(SHORT_DESCRIPTION,
    793                     tr("Add all primitives selected in the current dataset before the first selected member"));
     793                    tr("Add all objects selected in the current dataset before the first selected member"));
    794794            putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copybeforecurrentright"));
    795795            // putValue(NAME, tr("Add Selected"));
    … …  
    825825        public AddSelectedAfterSelection() {
    826826            putValue(SHORT_DESCRIPTION,
    827                     tr("Add all primitives selected in the current dataset after the last selected member"));
     827                    tr("Add all objects selected in the current dataset after the last selected member"));
    828828            putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyaftercurrentright"));
    829829            // putValue(NAME, tr("Add Selected"));
    … …  
    857857    class RemoveSelectedAction extends AbstractAction implements TableModelListener {
    858858        public RemoveSelectedAction() {
    859             putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected primitives"));
     859            putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects"));
    860860            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers"));
    861861            // putValue(NAME, tr("Remove Selected"));
    … …  
    894894    class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener {
    895895        public SelectedMembersForSelectionAction() {
    896             putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
     896            putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection"));
    897897            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers"));
    898898            updateEnabledState();
    … …  
    904904
    905905            if (enabled) {
    906                 putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} primitives in the current selection",memberTableModel.getChildPrimitives(getLayer().data.getSelected()).size()));
     906                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} objects in the current selection",memberTableModel.getChildPrimitives(getLayer().data.getSelected()).size()));
    907907            } else {
    908                 putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
     908                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection"));
    909909            }
    910910            setEnabled(enabled);
    … …  
    928928    class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener {
    929929        public SelectPrimitivesForSelectedMembersAction() {
    930             putValue(SHORT_DESCRIPTION, tr("Select primitives for selected relation members"));
     930            putValue(SHORT_DESCRIPTION, tr("Select objects for selected relation members"));
    931931            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives"));
    932932            updateEnabledState();
    … …  
    11831183            JOptionPane.showMessageDialog(
    11841184                    Main.parent,
    1185                     tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
     1185                    tr("<html>Layer ''{0}'' already has a conflict for object<br>"
    11861186                            + "''{1}''.<br>"
    11871187                            + "Please resolve this conflict first, then try again.</html>",
    … …  
    13811381        protected boolean confirmSettingEmptyRole(int onNumMembers) {
    13821382            String message = "<html>"
    1383                 + trn("You are setting an empty role on {0} primitive.",
    1384                         "You are setting an empty role on {0} primitives.", onNumMembers, onNumMembers)
     1383                + trn("You are setting an empty role on {0} object.",
     1384                        "You are setting an empty role on {0} objects.", onNumMembers, onNumMembers)
    13851385                        + "<br>"
    1386                         + tr("This is equal to deleting the roles of these primitives.") +
     1386                        + tr("This is equal to deleting the roles of these objects.") +
    13871387                        "<br>"
    13881388                        + tr("Do you really want to apply the new role?") + "</html>";

  • trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java

    r3083 r3995  
    2424        // column 0 - Version
    2525        col = new TableColumn(1);
    26         col.setHeaderValue(tr("Primitive"));
     26        col.setHeaderValue(tr("Object"));
    2727        col.setCellRenderer(renderer);
    2828        addColumn(col);

  • trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

    r3225 r3995  
    9292            // we tried to delete an already deleted primitive.
    9393            //
    94             System.out.println(tr("Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
     94            System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
    9595            processedPrimitives.addAll(writer.getProcessedPrimitives());
    9696            processedPrimitives.add(p);
    … …  
    106106    @Override
    107107    public void run() {
    108         monitor.indeterminateSubTask(tr("Preparing primitives to upload ..."));
     108        monitor.indeterminateSubTask(tr("Preparing objects to upload ..."));
    109109        APIDataSet ds = new APIDataSet(layer.data);
    110110        try {

  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r3362 r3995  
    421421            } catch(OsmApiException e) {
    422422                if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
    423                     logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive."));
     423                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each object."));
    424424                    singleGetIdPackage(type, pkg, progressMonitor);
    425425                } else
Note: See TracChangeset for help on using the changeset viewer.