swf node name fixed

This commit is contained in:
Honfika
2014-01-21 21:56:58 +01:00
parent 13722ba24c
commit e1f37eb0b6
3 changed files with 12 additions and 7 deletions

View File

@@ -448,10 +448,11 @@ public final class SWF implements TreeItem {
}
public String getShortFileName() {
if (file == null) {
String title = getFileTitle();
if (title == null) {
return "";
}
return new File(file).getName();
return new File(title).getName();
}
private void findFileAttributes() {

View File

@@ -53,6 +53,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import java.util.logging.ConsoleHandler;
import java.util.logging.FileHandler;
import java.util.logging.Formatter;
@@ -231,8 +232,9 @@ public class Main {
Stopwatch sw = Stopwatch.startNew();
if (bundle != null) {
result.isBundle = true;
result.name = sourceInfo.getFileTitleOrName();
for (ReReadableInputStream stream : bundle.getAll().values()) {
result.name = new File(sourceInfo.getFileTitleOrName()).getName();
for (Entry<String, ReReadableInputStream> streamEntry : bundle.getAll().entrySet()) {
InputStream stream = streamEntry.getValue();
stream.reset();
SWF swf = new SWF(stream, new ProgressListener() {
@Override
@@ -240,6 +242,8 @@ public class Main {
startWork(AppStrings.translate("work.reading.swf"), p);
}
}, Configuration.parallelSpeedUp.get());
swf.file = sourceInfo.getFile();
swf.fileTitle = streamEntry.getKey();
result.add(swf);
}
} else {
@@ -249,6 +253,8 @@ public class Main {
startWork(AppStrings.translate("work.reading.swf"), p);
}
}, Configuration.parallelSpeedUp.get());
swf.file = sourceInfo.getFile();
swf.fileTitle = sourceInfo.getFileTitle();
result.add(swf);
}
@@ -271,8 +277,6 @@ public class Main {
logger.log(Level.INFO, "Height: {0}", height);
swf.swfList = result;
swf.file = sourceInfo.getFile();
swf.fileTitle = sourceInfo.getFileTitle();
swf.addEventListener(new EventListener() {
@Override
public void handleEvent(String event, Object data) {

View File

@@ -76,7 +76,7 @@ public class TagTreeModel implements TreeModel {
List<ContainerItem> objs = new ArrayList<>();
objs.addAll(swf.tags);
ClassesListTreeModel classTreeModel = new ClassesListTreeModel(swf);
SWFNode swfNode = new SWFNode(swf, new File(swf.getFileTitle()).getName());
SWFNode swfNode = new SWFNode(swf, swf.getShortFileName());
swfNode.list = createTagList(objs, null, swf, swfNode, classTreeModel);
swfToSwfNode.put(swf, swfNode);
return swfNode;