LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Generic tag editor - brackets display

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-16 09:36:06 +02:00
parent 2e4e8ffe47
commit d0a69b1850
3 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
+14 -32
View File
@@ -956,23 +956,21 @@ public class GenericTagTreePanel extends GenericTagPanel {
if (swfType.value() != BasicType.OTHER) {
typeStr = "" + swfType.value();
}
if (isArrayParent) {
if (swfType.count() > 0) {
typeStr += "[" + swfType.count();
if (swfType.countAdd() > 0) {
typeStr += " + " + swfType.countAdd();
}
typeStr += "]";
bracketsDetected = true;
} else if (!swfType.countField().isEmpty()) {
typeStr += "[" + swfType.countField();
if (swfType.countAdd() > 0) {
typeStr += " + " + swfType.countAdd();
}
typeStr += "]";
bracketsDetected = true;
if (swfType.count() > 0) {
typeStr += "[" + swfType.count();
if (swfType.countAdd() > 0) {
typeStr += " + " + swfType.countAdd();
}
}
typeStr += "]";
bracketsDetected = true;
} else if (!swfType.countField().isEmpty()) {
typeStr += "[" + swfType.countField();
if (swfType.countAdd() > 0) {
typeStr += " + " + swfType.countAdd();
}
typeStr += "]";
bracketsDetected = true;
}
}
String arrayBrackets = "";
@@ -1516,28 +1514,20 @@ public class GenericTagTreePanel extends GenericTagPanel {
private void addItem(Object obj, Field field, int index, Class<?> cls) {
SWFArray swfArray = field.getAnnotation(SWFArray.class);
SWFType swfType = field.getAnnotation(SWFType.class);
String countFieldName = null;
if (swfArray != null && !swfArray.countField().isEmpty()) {
countFieldName = swfArray.countField();
}
if (swfType != null && !swfType.countField().isEmpty()) {
countFieldName = swfType.countField();
}
if (countFieldName != null) { //Fields with same countField must be enlarged too
Field[] fields = obj.getClass().getDeclaredFields();
List<Integer> sameFlds = new ArrayList<>();
for (int f = 0; f < fields.length; f++) {
SWFArray fieldSwfArray = fields[f].getAnnotation(SWFArray.class);
SWFType fieldSwfType = fields[f].getAnnotation(SWFType.class);
String fieldCountFieldName = null;
if (fieldSwfArray != null && !fieldSwfArray.countField().isEmpty()) {
fieldCountFieldName = fieldSwfArray.countField();
}
if (fieldSwfType != null && !fieldSwfType.countField().isEmpty()) {
fieldCountFieldName = fieldSwfType.countField();
}
if (fieldCountFieldName != null && fieldCountFieldName.equals(countFieldName)) {
sameFlds.add(f);
if (cls == null && !ReflectionTools.canAddToField(obj, fields[f])) {
@@ -1612,26 +1602,18 @@ public class GenericTagTreePanel extends GenericTagPanel {
private void removeItem(Object obj, Field field, int index) {
SWFArray swfArray = field.getAnnotation(SWFArray.class);
SWFType swfType = field.getAnnotation(SWFType.class);
String countFieldName = null;
if (swfArray != null && !swfArray.countField().isEmpty()) {
countFieldName = swfArray.countField();
}
if (swfType != null && !swfType.countField().isEmpty()) {
countFieldName = swfType.countField();
}
if (countFieldName != null) { //Fields with same countField must be removed from too
Field[] fields = obj.getClass().getDeclaredFields();
for (int f = 0; f < fields.length; f++) {
SWFArray fieldSwfArray = fields[f].getAnnotation(SWFArray.class);
SWFType fieldSwfType = fields[f].getAnnotation(SWFType.class);
String fieldCountFieldName = null;
if (fieldSwfArray != null && !fieldSwfArray.countField().isEmpty()) {
fieldCountFieldName = fieldSwfArray.countField();
}
if (fieldSwfType != null && !fieldSwfType.countField().isEmpty()) {
fieldCountFieldName = fieldSwfType.countField();
}
if (fieldCountFieldName != null && fieldCountFieldName.equals(countFieldName)) {
ReflectionTools.removeFromField(obj, fields[f], index);