Ignore:
Timestamp:
2009-09-06T23:07:33+02:00 (15 years ago)
Author:
Gubaer
Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

    r1937 r2070  
    66 * list is not sufficient.
    77 *
    8  * @author Frederik Ramm <frederik@remote.org>
    98 */
    109public class RelationMember {
    1110
     11    /**
     12     *
     13     * @deprecated use {@see #getRole()} or create a clone in order to assign a new role
     14     */
     15    @Deprecated
    1216    public String role;
     17
     18    /**
     19     *
     20     * @deprecated use {@see #getMember()} or create a clone in order to assign a new member
     21     */
     22    @Deprecated
    1323    public OsmPrimitive member;
    1424
    … …  
    1929     */
    2030    public String getRole() {
    21         if (role == null) {
     31        if (role == null)
    2232            return "";
    23         } else {
    24             return role;
    25         }
     33        return role;
    2634    }
    2735
    … …  
    4553
    4654    /**
    47     *
    48     * @return True if member is way
    49     * @since 1937
    50     */
     55     *
     56     * @return True if member is way
     57     * @since 1937
     58     */
    5159    public boolean isWay() {
    5260        return member instanceof Way;
    … …  
    5462
    5563    /**
    56     *
    57     * @return True if member is node
    58     * @since 1937
    59     */
     64     *
     65     * @return True if member is node
     66     * @since 1937
     67     */
    6068    public boolean isNode() {
    6169        return member instanceof Node;
    … …  
    7280
    7381    /**
    74     *
    75     * @return Member as way
    76     * @since 1937
    77     */
     82     *
     83     * @return Member as way
     84     * @since 1937
     85     */
    7886    public Way getWay() {
    7987        return (Way)member;
    … …  
    8189
    8290    /**
    83     *
    84     * @return Member as node
    85     * @since 1937
    86     */
     91     *
     92     * @return Member as node
     93     * @since 1937
     94     */
    8795    public Node getNode() {
    8896        return (Node)member;
    … …  
    9098
    9199    /**
    92     *
    93     * @return Member
    94     * @since 1937
    95     */
     100     *
     101     * @return Member
     102     * @since 1937
     103     */
    96104    public OsmPrimitive getMember() {
    97105        return member;
    … …  
    101109    /**
    102110     * Default constructor. Does nothing.
    103      * @deprecated Use other constructors because RelationMember class will became immutable
     111     * @deprecated Use other constructors because RelationMember class will become immutable
    104112     * in the future
    105113     */
Note: See TracChangeset for help on using the changeset viewer.