Subject: [PATCH] 4142 --- Index: src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java --- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 19073) +++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (date 1715101780055) @@ -3,6 +3,9 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.text.MessageFormat; import java.time.Instant; import java.util.ArrayList; @@ -130,11 +133,16 @@ */ protected static final short FLAG_PRESERVED = 1 << 13; + /** + * Determines if the primitive has all of its referrers + */ + protected static final short FLAG_ALL_REFERRERS_DOWNLOADED = 1 << 14; + /** * Put several boolean flags to one short int field to save memory. * Other bits of this field are used in subclasses. */ - protected volatile short flags = FLAG_VISIBLE; // visible per default + private volatile short flags = FLAG_VISIBLE; // visible per default /** * The mappaint cache index for this primitive. @@ -365,6 +373,27 @@ return oldFlags != flags; } + protected void writeObjectCommon(ObjectOutputStream oos) throws IOException { + oos.writeLong(id); + oos.writeLong(user == null ? -1 : user.getId()); + oos.writeInt(version); + oos.writeInt(changesetId); + oos.writeInt(timestamp); + oos.writeObject(keys); + oos.writeShort(flags); + } + + protected void readObjectCommon(ObjectInputStream ois) throws ClassNotFoundException, IOException { + id = ois.readLong(); + final long userId = ois.readLong(); + user = userId == -1 ? null : User.getById(userId); + version = ois.readInt(); + changesetId = ois.readInt(); + timestamp = ois.readInt(); + keys = (String[]) ois.readObject(); + flags = ois.readShort(); + } + @Override public void setModified(boolean modified) { updateFlags(FLAG_MODIFIED, modified); @@ -408,6 +437,46 @@ setModified(deleted ^ !isVisible()); } + @Override + public boolean hasDirectionKeys() { + return (flags & FLAG_HAS_DIRECTIONS) != 0; + } + + @Override + public boolean reversedDirection() { + return (flags & FLAG_DIRECTION_REVERSED) != 0; + } + + @Override + public boolean isTagged() { + return (flags & FLAG_TAGGED) != 0; + } + + @Override + public boolean isAnnotated() { + return (flags & FLAG_ANNOTATED) != 0; + } + + @Override + public boolean isHighlighted() { + return (flags & FLAG_HIGHLIGHTED) != 0; + } + + @Override + public boolean isDisabled() { + return (flags & FLAG_DISABLED) != 0; + } + + @Override + public boolean isDisabledAndHidden() { + return ((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0); + } + + @Override + public boolean isPreserved() { + return (flags & FLAG_PRESERVED) != 0; + } + /** * If set to true, this object is incomplete, which means only the id * and type is known (type is the objects instance class) Index: src/org/openstreetmap/josm/data/osm/IPrimitive.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/osm/IPrimitive.java b/src/org/openstreetmap/josm/data/osm/IPrimitive.java --- a/src/org/openstreetmap/josm/data/osm/IPrimitive.java (revision 19073) +++ b/src/org/openstreetmap/josm/data/osm/IPrimitive.java (date 1715098909518) @@ -36,6 +36,10 @@ */ void setModified(boolean modified); + default void setReferrersDownloaded(boolean referrersDownloaded) { + + } + /** * Checks if object is known to the server. * Replies true if this primitive is either unknown to the server (i.e. its id @@ -75,6 +79,16 @@ */ void setDeleted(boolean deleted); + /** + * Determines if this primitive is fully downloaded + * @return {@code true} if the primitive is fully downloaded and all parents and children should be available. + * {@code false} otherwise. + * @since xxx + */ + default boolean isReferrersDownloaded() { + return false; + } + /** * Determines if this primitive is incomplete. * @return {@code true} if this primitive is incomplete, {@code false} otherwise Index: src/org/openstreetmap/josm/data/osm/OsmPrimitive.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java --- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 19073) +++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (date 1715100310273) @@ -363,20 +363,6 @@ updateFlags(FLAG_PRESERVED, isPreserved); } - @Override - public boolean isDisabled() { - return (flags & FLAG_DISABLED) != 0; - } - - @Override - public boolean isDisabledAndHidden() { - return ((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0); - } - - @Override - public boolean isPreserved() { - return (flags & FLAG_PRESERVED) != 0; - } @Override public boolean isSelectable() { @@ -492,11 +478,6 @@ } } - @Override - public boolean isHighlighted() { - return (flags & FLAG_HIGHLIGHTED) != 0; - } - /*--------------- * DIRECTION KEYS *---------------*/ @@ -526,16 +507,6 @@ updateFlagsNoLock(FLAG_ANNOTATED, hasKeys() && getWorkInProgressKeys().stream().anyMatch(this::hasKey)); } - @Override - public boolean isTagged() { - return (flags & FLAG_TAGGED) != 0; - } - - @Override - public boolean isAnnotated() { - return (flags & FLAG_ANNOTATED) != 0; - } - protected void updateDirectionFlags() { boolean hasDirections = false; boolean directionReversed = false; @@ -551,16 +522,6 @@ updateFlagsNoLock(FLAG_HAS_DIRECTIONS, hasDirections); } - @Override - public boolean hasDirectionKeys() { - return (flags & FLAG_HAS_DIRECTIONS) != 0; - } - - @Override - public boolean reversedDirection() { - return (flags & FLAG_DIRECTION_REVERSED) != 0; - } - /*------------ * Keys handling ------------*/ @@ -851,12 +812,10 @@ throw new DataIntegrityProblemException( tr("Cannot merge primitives with different ids. This id is {0}, the other is {1}", id, other.getId())); + setIncomplete(other.isIncomplete()); + super.cloneFrom(other); setKeys(other.hasKeys() ? other.getKeys() : null); - timestamp = other.timestamp; version = other.version; - setIncomplete(other.isIncomplete()); - flags = other.flags; - user = other.user; changesetId = other.changesetId; } finally { writeUnlock(locked); Index: src/org/openstreetmap/josm/data/osm/PrimitiveData.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java --- a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (revision 19073) +++ b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (date 1715101245055) @@ -84,26 +84,13 @@ private void writeObject(ObjectOutputStream oos) throws IOException { // since super class is not Serializable - oos.writeLong(id); - oos.writeLong(user == null ? -1 : user.getId()); - oos.writeInt(version); - oos.writeInt(changesetId); - oos.writeInt(timestamp); - oos.writeObject(keys); - oos.writeShort(flags); + super.writeObjectCommon(oos); oos.defaultWriteObject(); } private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException { // since super class is not Serializable - id = ois.readLong(); - final long userId = ois.readLong(); - user = userId == -1 ? null : User.getById(userId); - version = ois.readInt(); - changesetId = ois.readInt(); - timestamp = ois.readInt(); - keys = (String[]) ois.readObject(); - flags = ois.readShort(); + super.readObjectCommon(ois); ois.defaultReadObject(); } Index: src/org/openstreetmap/josm/data/vector/VectorPrimitive.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/vector/VectorPrimitive.java b/src/org/openstreetmap/josm/data/vector/VectorPrimitive.java --- a/src/org/openstreetmap/josm/data/vector/VectorPrimitive.java (revision 19073) +++ b/src/org/openstreetmap/josm/data/vector/VectorPrimitive.java (date 1715099761714) @@ -58,11 +58,6 @@ this.highlighted = highlighted; } - @Override - public boolean isTagged() { - return (flags & FLAG_TAGGED) != 0; - } - @Override public boolean isAnnotated() { return this.getInterestingTags().size() - this.getKeys().size() > 0;