closing swffixed, #766 [error] Can't extract all resources from the swf fixed

This commit is contained in:
2015-01-11 15:52:22 +01:00
parent c16e2abfc1
commit 18e7b1ecf6
3 changed files with 9 additions and 3 deletions
@@ -156,7 +156,9 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
finalizePath(); finalizePath();
thickness *= zoom / SWF.unitDivisor; thickness *= zoom / SWF.unitDivisor;
path.setAttribute("fill", "none"); path.setAttribute("fill", "none");
path.setAttribute("stroke", color.toHexRGB()); if (color != null) {
path.setAttribute("stroke", color.toHexRGB());
}
path.setAttribute("stroke-width", Double.toString(thickness == 0 ? 1 : thickness)); path.setAttribute("stroke-width", Double.toString(thickness == 0 ? 1 : thickness));
if (color instanceof RGBA) { if (color instanceof RGBA) {
RGBA colorA = (RGBA) color; RGBA colorA = (RGBA) color;
@@ -44,7 +44,11 @@ public class SWFList implements List<SWF>, SWFContainerItem {
@Override @Override
public String toString() { public String toString() {
return name; if (isBundle) {
return name;
} else {
return swfs.get(0).getFileTitle();
}
} }
@Override @Override
@@ -695,7 +695,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
} }
if (modified) { if (modified) {
if (View.showConfirmDialog(this, translate("message.confirm.close").replace("{swfName}",swfList.name), translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.CANCEL_OPTION) == JOptionPane.CANCEL_OPTION) { if (View.showConfirmDialog(this, translate("message.confirm.close").replace("{swfName}", swfList.toString()), translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.OK_OPTION) == JOptionPane.CANCEL_OPTION) {
return; return;
} }
} }