LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-11 11:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: XML Import - not set SWF and Timelined internal values caused an exception on item display

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-07 10:05:54 +01:00
parent c339113f45
commit 79afa05506
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/SwfXmlImporter.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.importers;
import com.jpexs.decompiler.flash.SWF;
@@ -37,6 +38,7 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
import com.jpexs.decompiler.flash.abc.types.traits.Traits;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Value;
import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.TagTypeInfo;
import com.jpexs.decompiler.flash.types.ALPHABITMAPDATA;
@@ -143,11 +145,26 @@ public class SwfXmlImporter {
Document doc = docBuilder.parse(new InputSource(new StringReader(xml)));
processElement(doc.getDocumentElement(), swf, swf, null);
swf.clearAllCache();
setSwfAndTimelined(swf);
} catch (ParserConfigurationException | SAXException ex) {
logger.log(Level.SEVERE, null, ex);
}
}
private void setSwfAndTimelined(SWF swf) {
for (Tag t : swf.getTags()) {
t.setSwf(swf);
t.setTimelined(swf);
if (t instanceof DefineSpriteTag) {
DefineSpriteTag s = (DefineSpriteTag) t;
for (Tag st : s.getTags()) {
st.setSwf(swf);
st.setTimelined(s);
}
}
}
}
public Object importObject(String xml, Class requiredType, SWF swf) throws IOException {
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
try {