From cfcc7775f28664f14e4175b5b2440429618b0628 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 1 Jun 2015 21:59:39 +0200 Subject: [PATCH] frame & timeline equals method --- .../jpexs/decompiler/flash/timeline/Frame.java | 15 +++++++++++++++ .../jpexs/decompiler/flash/timeline/Timeline.java | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java index 007c97a24..d00e96059 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java @@ -88,6 +88,21 @@ public class Frame implements TreeItem, Exportable { return "frame_" + (frame + 1); } + @Override + public boolean equals(Object obj) { + if (obj instanceof Frame) { + Frame frameObj = (Frame) obj; + return timeline.equals(frameObj.timeline) && frame == frameObj.frame; + } + + return false; + } + + @Override + public int hashCode() { + return timeline.hashCode() ^ Integer.hashCode(frame); + } + @Override public boolean isModified() { for (Tag t : innerTags) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java index b7ecb5192..d1f67d936 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java @@ -713,4 +713,14 @@ public class Timeline { return true; } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Timeline) { + Timeline timelineObj = (Timeline) obj; + return timelined.equals(timelineObj.timelined) && parentTag == timelineObj.parentTag; + } + + return false; + } }