Changeset 4223 in josm


Ignore:
Timestamp:
2011-07-10T22:46:41+02:00 (8 years ago)
Author:
stoecker
Message:

fix #6570 (revert change in r4215, see #6547), i18n update, fix typo in function names

Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java

    r3210 r4223  
    3434     * @param added A collection of newly-visible primitives
    3535     */
    36     void primtivesAdded(PrimitivesAddedEvent event);
     36    void primitivesAdded(PrimitivesAddedEvent event);
    3737
    3838    /**
     
    4242     * @param removed A collection of newly-invisible primitives
    4343     */
    44     void primtivesRemoved(PrimitivesRemovedEvent event);
     44    void primitivesRemoved(PrimitivesRemovedEvent event);
    4545
    4646    /**
  • trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java

    r3083 r4223  
    2828    }
    2929
    30     public void primtivesAdded(PrimitivesAddedEvent event) {
     30    public void primitivesAdded(PrimitivesAddedEvent event) {
    3131        listener.processDatasetEvent(event);
    3232    }
    3333
    34     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     34    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    3535        listener.processDatasetEvent(event);
    3636    }
  • trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java

    r3083 r4223  
    2323    @Override
    2424    public void fire(DataSetListener listener) {
    25         listener.primtivesAdded(this);
     25        listener.primitivesAdded(this);
    2626    }
    2727
  • trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java

    r3083 r4223  
    2323    @Override
    2424    public void fire(DataSetListener listener) {
    25         listener.primtivesRemoved(this);
     25        listener.primitivesRemoved(this);
    2626    }
    2727
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

    r3083 r4223  
    223223     * Applies this resolution to a collection of primitives
    224224     *
    225      * @param primtives the collection of primitives
    226      * @throws IllegalStateException thrown if this resolution is not resolved yet
    227      */
    228     public void applyTo(Collection<? extends OsmPrimitive> primtives) throws IllegalStateException {
    229         if (primtives == null) return;
    230         for (OsmPrimitive primitive: primtives) {
     225     * @param primitives the collection of primitives
     226     * @throws IllegalStateException thrown if this resolution is not resolved yet
     227     */
     228    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
     229        if (primitives == null) return;
     230        for (OsmPrimitive primitive: primitives) {
    231231            if (primitive == null) {
    232232                continue;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r4072 r4223  
    275275    }
    276276
    277     public void primtivesAdded(PrimitivesAddedEvent event) {
     277    public void primitivesAdded(PrimitivesAddedEvent event) {
    278278        filterModel.executeFilters(event.getPrimitives());
    279279    }
    280280
    281     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     281    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    282282        filterModel.executeFilters();
    283283    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r4221 r4223  
    831831    public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
    832832
    833     public void primtivesAdded(final PrimitivesAddedEvent event) {
     833    public void primitivesAdded(final PrimitivesAddedEvent event) {
    834834        model.addRelations(event.getPrimitives());
    835835        model.updateTitle();
    836836    }
    837837
    838     public void primtivesRemoved(final PrimitivesRemovedEvent event) {
     838    public void primitivesRemoved(final PrimitivesRemovedEvent event) {
    839839        model.removeRelations(event.getPrimitives());
    840840        model.updateTitle();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r4191 r4223  
    739739        }
    740740
    741         public void primtivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
    742         public void primtivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
     741        public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
     742        public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
    743743    }
    744744
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

    r3083 r4223  
    3636    }
    3737
    38     public void primtivesAdded(PrimitivesAddedEvent event) {
     38    public void primitivesAdded(PrimitivesAddedEvent event) {
    3939        for (OsmPrimitive primitive:event.getPrimitives()) {
    4040            addChangeset(new Changeset(primitive.getChangesetId()));
     
    4242    }
    4343
    44     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     44    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    4545        for (OsmPrimitive primitive:event.getPrimitives()) {
    4646            removeChangeset(new Changeset(primitive.getChangesetId()));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r4221 r4223  
    279279        memberTable.addMouseListener(new MemberTableDblClickAdapter());
    280280        memberTableModel.addMemberModelListener(memberTable);
    281         // setup a cell editor with a small border
    282         final JTextField cellEditorTextField = new JTextField();
    283         cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
    284         cellEditorTextField.addFocusListener(
    285                 new FocusAdapter() {
    286                     @Override public void focusGained(FocusEvent e) {
    287                         cellEditorTextField.selectAll();
    288                     }
    289                 }
    290         );
    291         DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField);
    292         cellEditor.setClickCountToStart(1);
    293         memberTable.getColumnModel().getColumn(0).setCellEditor(cellEditor);
    294         memberTable.setRowHeight(cellEditorTextField.getPreferredSize().height);
    295281
    296282        final JScrollPane scrollPane = new JScrollPane(memberTable);
     
    361347        );
    362348        tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
     349        memberTable.setRowHeight(tfRole.getPreferredSize().height);
    363350        SideButton btnApply = new SideButton(setRoleAction);
    364351        btnApply.setPreferredSize(new Dimension(20,20));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r3928 r4223  
    107107
    108108    public void nodeMoved(NodeMovedEvent event) {/* ignore */}
    109     public void primtivesAdded(PrimitivesAddedEvent event) {/* ignore */}
    110 
    111     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     109    public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
     110
     111    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    112112        // ignore - the relation in the editor might become out of sync with the relation
    113113        // in the dataset. We will deal with it when the relation editor is closed or
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r4191 r4223  
    780780    }
    781781
    782     public void primtivesAdded(PrimitivesAddedEvent event) {
     782    public void primitivesAdded(PrimitivesAddedEvent event) {
    783783        for (OsmPrimitive p: event.getPrimitives()) {
    784784            if (canShowAsLatest(p)) {
     
    788788    }
    789789
    790     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     790    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    791791        for (OsmPrimitive p: event.getPrimitives()) {
    792792            if (!p.isNew() && p.getId() == history.getId()) {
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

    r3479 r4223  
    282282     **/
    283283
    284     public void primtivesAdded(PrimitivesAddedEvent event) {
     284    public void primitivesAdded(PrimitivesAddedEvent event) {
    285285        if (dirty)
    286286            return;
     
    288288    }
    289289
    290     public void primtivesRemoved(PrimitivesRemovedEvent event) {
     290    public void primitivesRemoved(PrimitivesRemovedEvent event) {
    291291        dirty = true;
    292292    }
Note: See TracChangeset for help on using the changeset viewer.