diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java index 8be5baaee..6fcb1350a 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/asdec/Main.java @@ -16,7 +16,6 @@ */ package com.jpexs.asdec; -import com.jpexs.asdec.abc.NotSameException; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.gui.AboutDialog; import com.jpexs.asdec.gui.LoadingDialog; @@ -24,8 +23,6 @@ import com.jpexs.asdec.gui.MainFrame; import com.jpexs.asdec.gui.ModeFrame; import com.jpexs.asdec.gui.View; import com.jpexs.asdec.gui.proxy.ProxyFrame; -import com.jpexs.asdec.tags.DoABCTag; -import com.jpexs.asdec.tags.Tag; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -33,9 +30,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.*; import java.net.Socket; -import java.util.ArrayList; import java.util.Calendar; -import java.util.List; import java.util.logging.ConsoleHandler; import java.util.logging.FileHandler; import java.util.logging.Level; diff --git a/trunk/src/com/jpexs/asdec/SWF.java b/trunk/src/com/jpexs/asdec/SWF.java index 4d3d4b915..bce7de429 100644 --- a/trunk/src/com/jpexs/asdec/SWF.java +++ b/trunk/src/com/jpexs/asdec/SWF.java @@ -29,16 +29,7 @@ import com.jpexs.asdec.tags.DoABCTag; import com.jpexs.asdec.tags.JPEGTablesTag; import com.jpexs.asdec.tags.Tag; import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.types.ALPHABITMAPDATA; -import com.jpexs.asdec.types.ALPHACOLORMAPDATA; -import com.jpexs.asdec.types.BITMAPDATA; -import com.jpexs.asdec.types.COLORMAPDATA; import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGB; -import com.jpexs.asdec.types.RGBA; -import java.awt.Color; -import java.awt.Graphics; -import java.awt.image.BufferedImage; import java.io.*; import java.util.ArrayList; import java.util.HashSet; @@ -394,7 +385,7 @@ public class SWF { } List existingNames = new ArrayList(); for (TagNode node : nodeList) { - String name=""; + String name = ""; if (node.tag instanceof Tag) { name = ((Tag) node.tag).getExportName(); } @@ -526,12 +517,12 @@ public class SWF { } } if (t instanceof DefineBitsLosslessTag) { - DefineBitsLosslessTag dbl = (DefineBitsLosslessTag) t; + DefineBitsLosslessTag dbl = (DefineBitsLosslessTag) t; ImageIO.write(dbl.getImage(), "PNG", new File(outdir + File.separator + dbl.characterID + ".png")); } if (t instanceof DefineBitsLossless2Tag) { DefineBitsLossless2Tag dbl = (DefineBitsLossless2Tag) t; - + ImageIO.write(dbl.getImage(), "PNG", new File(outdir + File.separator + dbl.characterID + ".png")); } if ((jtt != null) && (t instanceof DefineBitsTag)) { diff --git a/trunk/src/com/jpexs/asdec/SWFInputStream.java b/trunk/src/com/jpexs/asdec/SWFInputStream.java index 28d384fff..b040ae186 100644 --- a/trunk/src/com/jpexs/asdec/SWFInputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFInputStream.java @@ -388,7 +388,7 @@ public class SWFInputStream extends InputStream { * @throws IOException */ public float readFB(int nBits) throws IOException { - if(nBits==0){ + if (nBits == 0) { return 0; } float val = readSB(nBits); @@ -409,7 +409,7 @@ public class SWFInputStream extends InputStream { ret.Xmax = (int) readSB(NBits); ret.Ymin = (int) readSB(NBits); ret.Ymax = (int) readSB(NBits); - ret.nbits=NBits; + ret.nbits = NBits; alignByte(); return ret; } @@ -497,7 +497,7 @@ public class SWFInputStream extends InputStream { Tag ret; switch (tagID) { case 0: - ret =new EndTag(data, version, pos); + ret = new EndTag(data, version, pos); break; case 1: ret = new ShowFrameTag(pos); @@ -522,7 +522,7 @@ public class SWFInputStream extends InputStream { ret = new JPEGTablesTag(data, pos); break; case 9: - ret = new SetBackgroundColorTag(data, version,pos); + ret = new SetBackgroundColorTag(data, version, pos); break; case 10: ret = new DefineFontTag(data, version, pos); @@ -712,7 +712,7 @@ public class SWFInputStream extends InputStream { ret = new DefineFont4Tag(data, version, pos); break; default: - ret = new Tag(tagID,"Unknown", data, pos); + ret = new Tag(tagID, "Unknown", data, pos); } ret.forceWriteAsLong = readLong; byte dataNew[] = ret.getData(version); @@ -994,21 +994,21 @@ public class SWFInputStream extends InputStream { ret.hasScale = readUB(1) == 1; if (ret.hasScale) { int NScaleBits = (int) readUB(5); - ret.scaleX = (int)readSB(NScaleBits); - ret.scaleY = (int)readSB(NScaleBits); - ret.bitsScale=NScaleBits; + ret.scaleX = (int) readSB(NScaleBits); + ret.scaleY = (int) readSB(NScaleBits); + ret.bitsScale = NScaleBits; } ret.hasRotate = readUB(1) == 1; if (ret.hasRotate) { int NRotateBits = (int) readUB(5); - ret.rotateSkew0 = (int)readSB(NRotateBits); - ret.rotateSkew1 = (int)readSB(NRotateBits); - ret.bitsRotate=NRotateBits; + ret.rotateSkew0 = (int) readSB(NRotateBits); + ret.rotateSkew1 = (int) readSB(NRotateBits); + ret.bitsRotate = NRotateBits; } int NTranslateBits = (int) readUB(5); ret.translateX = (int) readSB(NTranslateBits); ret.translateY = (int) readSB(NTranslateBits); - ret.bitsTranslate=NTranslateBits; + ret.bitsTranslate = NTranslateBits; alignByte(); return ret; } diff --git a/trunk/src/com/jpexs/asdec/SWFOutputStream.java b/trunk/src/com/jpexs/asdec/SWFOutputStream.java index e38d4c0e6..2dad2d726 100644 --- a/trunk/src/com/jpexs/asdec/SWFOutputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFOutputStream.java @@ -307,9 +307,9 @@ public class SWFOutputStream extends OutputStream { public void writeSB(int nBits, long value) throws IOException { long tmp = value & 0x7FFFFFFF; - if (value < 0) { - tmp = tmp | (1L << (nBits - 1)); - } + if (value < 0) { + tmp = tmp | (1L << (nBits - 1)); + } writeUB(nBits, value); } @@ -321,14 +321,13 @@ public class SWFOutputStream extends OutputStream { * @throws IOException */ public void writeFB(int nBits, double value) throws IOException { - if(nBits==0){ + if (nBits == 0) { return; } long longVal = (long) (value * (1 << 16)); writeSB(nBits, longVal); } - /** * Writes RECT value to the stream * @@ -373,9 +372,9 @@ public class SWFOutputStream extends OutputStream { * @throws IOException */ public void writeTag(Tag tag) throws IOException { - byte data[] = tag.getData(version); + byte data[] = tag.getData(version); int tagLength = data.length; - int tagID = tag.getId(); + int tagID = tag.getId(); int tagIDLength = (tagID << 6); if ((tagLength < 0x3f) && (!tag.forceWriteAsLong)) { tagIDLength += tagLength; @@ -387,6 +386,7 @@ public class SWFOutputStream extends OutputStream { } write(data); } + /** * Calculates number of bits needed for representing unsigned value * @@ -396,14 +396,14 @@ public class SWFOutputStream extends OutputStream { public static int getNeededBitsU(int value) { value = Math.abs(value); long x = 1; - int nBits; + int nBits; - for (nBits = 1; nBits <= 64; nBits++) { - x <<= 1; - if (x > value) { - break; - } - } + for (nBits = 1; nBits <= 64; nBits++) { + x <<= 1; + if (x > value) { + break; + } + } return nBits; } @@ -414,17 +414,17 @@ public class SWFOutputStream extends OutputStream { * @return Number of bits */ public static int getNeededBitsS(int v) { - if(v==0){ + if (v == 0) { //return 0; } - int counter = 32; - int mask = 0x80000000; - final int val = (v < 0) ? -v : v; - while (((val & mask) == 0) && (counter > 0)) { - mask >>>= 1; - counter -= 1; - } - return counter + 1; + int counter = 32; + int mask = 0x80000000; + final int val = (v < 0) ? -v : v; + while (((val & mask) == 0) && (counter > 0)) { + mask >>>= 1; + counter -= 1; + } + return counter + 1; } private static long getIntPart(double value) { @@ -441,34 +441,31 @@ public class SWFOutputStream extends OutputStream { return value + getIntPart(value); } - public static int unsignedSize(final int value) { - final int val = (value < 0) ? -value - 1 : value; - int counter = 32; - int mask = 0x80000000; + final int val = (value < 0) ? -value - 1 : value; + int counter = 32; + int mask = 0x80000000; - while (((val & mask) == 0) && (counter > 0)) { - mask >>>= 1; - counter -= 1; - } - return counter; - } - + while (((val & mask) == 0) && (counter > 0)) { + mask >>>= 1; + counter -= 1; + } + return counter; + } - /** * Calculates number of bits needed for representing fixed-point value * * @param value Fixed-point value * @return Number of bits */ - public static int getNeededBitsF(float value) { + public static int getNeededBitsF(float value) { //0.26213074 16bits //0.5 17bits //1.3476715 18bits - int k=(int)value; - return getNeededBitsS(k)+16; + int k = (int) value; + return getNeededBitsS(k) + 16; } private int enlargeBitCountU(int currentBitCount, int value) { @@ -504,7 +501,7 @@ public class SWFOutputStream extends OutputStream { public void writeMatrix(MATRIX value) throws IOException { writeUB(1, value.hasScale ? 1 : 0); if (value.hasScale) { - int nBits=0; + int nBits = 0; nBits = enlargeBitCountS(nBits, value.scaleX); nBits = enlargeBitCountS(nBits, value.scaleY); writeUB(5, nBits); @@ -520,12 +517,12 @@ public class SWFOutputStream extends OutputStream { writeSB(nBits, value.rotateSkew0); writeSB(nBits, value.rotateSkew1); } - int NTranslateBits=0; + int NTranslateBits = 0; NTranslateBits = enlargeBitCountS(NTranslateBits, value.translateX); NTranslateBits = enlargeBitCountS(NTranslateBits, value.translateY); - + writeUB(5, NTranslateBits); - + writeSB(NTranslateBits, value.translateX); writeSB(NTranslateBits, value.translateY); alignByte(); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java index c57c6906e..86c8fb234 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java @@ -16,21 +16,16 @@ */ package com.jpexs.asdec.abc.gui; -import com.jpexs.asdec.Configuration; import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.gui.tablemodels.*; -import com.jpexs.asdec.gui.LoadingPanel; import com.jpexs.asdec.gui.View; import com.jpexs.asdec.tags.DoABCTag; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.*; -import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.*; @@ -55,15 +50,11 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { public JSplitPane splitPaneTreeNavVSDecompiledDetail; private JTable constantTable; public JComboBox constantTypeList; - - public JLabel asmLabel = new JLabel("P-code source (editable)"); public JLabel decLabel = new JLabel("ActionScript source"); public DetailPanel detailPanel; public JTextField filterField = new JTextField(""); - - private JTable autoResizeColWidth(JTable table, TableModel model) { table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); table.setModel(model); @@ -160,30 +151,30 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { updateConstList(); } - public void initSplits(){ - splitPaneTreeVSNavigator.setDividerLocation(splitPaneTreeVSNavigator.getHeight()/2); + public void initSplits() { + splitPaneTreeVSNavigator.setDividerLocation(splitPaneTreeVSNavigator.getHeight() / 2); try { Thread.sleep(100); } catch (InterruptedException ex) { Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex); } - splitPaneTreeNavVSDecompiledDetail.setDividerLocation(splitPaneTreeNavVSDecompiledDetail.getWidth()*1/3); + splitPaneTreeNavVSDecompiledDetail.setDividerLocation(splitPaneTreeNavVSDecompiledDetail.getWidth() * 1 / 3); try { Thread.sleep(100); } catch (InterruptedException ex) { Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex); } - splitPaneDecompiledVSDetail.setDividerLocation(splitPaneDecompiledVSDetail.getWidth()*1/2); - + splitPaneDecompiledVSDetail.setDividerLocation(splitPaneDecompiledVSDetail.getWidth() * 1 / 2); + } - + public ABCPanel(List list) { - + DefaultSyntaxKit.initKit(); this.list = list; - if(list.size()>0){ + if (list.size() > 0) { this.abc = list.get(listIndex).abc; } setLayout(new BorderLayout()); @@ -270,7 +261,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { JTabbedPane tabbedPane = new JTabbedPane(); tabbedPane.addTab("Scripts", splitPaneTreeVSNavigator); //tabbedPane.setTabPlacement(JTabbedPane.BOTTOM); - + pan2.add(tabbedPane, BorderLayout.CENTER); abcComboBox.addItemListener(this); @@ -283,18 +274,18 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { //pan2.setPreferredSize(new Dimension(300, 200)); - + add(splitPaneTreeNavVSDecompiledDetail, BorderLayout.CENTER); - - + + JPanel panConstants = new JPanel(); panConstants.setLayout(new BorderLayout()); constantTypeList = new JComboBox(new String[]{"UINT", "INT", "DOUBLE", "DECIMAL", "STRING", "NAMESPACE", "NAMESPACESET", "MULTINAME"}); constantTable = new JTable(); - if(abc!=null){ - autoResizeColWidth(constantTable, new UIntTableModel(abc)); + if (abc != null) { + autoResizeColWidth(constantTable, new UIntTableModel(abc)); } constantTable.setAutoCreateRowSorter(true); @@ -322,7 +313,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { panConstants.add(constantTypeList, BorderLayout.NORTH); panConstants.add(new JScrollPane(constantTable), BorderLayout.CENTER); tabbedPane.addTab("Constants", panConstants); - + } @@ -330,8 +321,6 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { classTree.applyFilter(filterField.getText()); } - - public void reload() { switchAbc(listIndex - 1); } diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java index 99484fff2..f71c10e76 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java @@ -40,7 +40,7 @@ public class DecimalTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_decimal.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java index d6d5421c3..3080c1c9b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java @@ -40,7 +40,7 @@ public class DoubleTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_double.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java index 18e892bd8..8f0260c36 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java @@ -40,7 +40,7 @@ public class IntTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_int.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java index d321f216a..ebf2b6f14 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java @@ -41,7 +41,7 @@ public class MultinameTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_multiname.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java index e2475b96b..ba4005d2e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java @@ -40,7 +40,7 @@ public class NamespaceSetTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_namespace_set.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java index e74b4145a..1e959f107 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java @@ -40,7 +40,7 @@ public class NamespaceTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_namespace.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java index 6348897b5..346dd9d5f 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java @@ -40,7 +40,7 @@ public class StringTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_string.length; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java index 2078be2ee..5d66fe36c 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java @@ -40,7 +40,7 @@ public class UIntTableModel implements TableModel { * @see #getColumnCount */ public int getRowCount() { - if(abc==null){ + if (abc == null) { return 0; } return abc.constants.constant_uint.length; diff --git a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java index c541f5a5b..8396bcca4 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java +++ b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java @@ -16,28 +16,19 @@ */ package com.jpexs.asdec.action.gui; -import com.jpexs.asdec.Configuration; import com.jpexs.asdec.Main; import com.jpexs.asdec.SWF; import com.jpexs.asdec.action.TagNode; import com.jpexs.asdec.action.parser.ASMParser; import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.gui.LoadingPanel; -import com.jpexs.asdec.gui.View; import com.jpexs.asdec.helpers.Highlighting; import com.jpexs.asdec.tags.Tag; import com.jpexs.asdec.tags.base.ASMSource; import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.util.List; import javax.swing.*; @@ -61,7 +52,6 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action public JLabel asmLabel = new JLabel("P-code source (editable)"); public JLabel decLabel = new JLabel("ActionScript source"); - public ActionPanel(List list) { this.list = list; DefaultSyntaxKit.initKit(); @@ -107,7 +97,7 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action - + setLayout(new BorderLayout()); add(splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(tagTree), splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panA, panB)), BorderLayout.CENTER); splitPane.setResizeWeight(0.5); @@ -117,10 +107,10 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action tagTree.addTreeSelectionListener(this); } - - public void initSplits(){ - splitPane.setDividerLocation(getWidth()/3); - splitPane2.setDividerLocation(getWidth()/3); + + public void initSplits() { + splitPane.setDividerLocation(getWidth() / 3); + splitPane2.setDividerLocation(getWidth() / 3); } public void valueChanged(TreeSelectionEvent e) { @@ -172,5 +162,4 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action } } } - } diff --git a/trunk/src/com/jpexs/asdec/gui/ImagePanel.java b/trunk/src/com/jpexs/asdec/gui/ImagePanel.java index ea14c4b40..741f14735 100644 --- a/trunk/src/com/jpexs/asdec/gui/ImagePanel.java +++ b/trunk/src/com/jpexs/asdec/gui/ImagePanel.java @@ -2,10 +2,6 @@ package com.jpexs.asdec.gui; import java.awt.BorderLayout; import java.awt.Image; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -26,24 +22,23 @@ import javax.swing.JPanel; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - public class ImagePanel extends JPanel { - public JLabel label=new JLabel(); + + public JLabel label = new JLabel(); public ImagePanel() { super(new BorderLayout()); label.setHorizontalAlignment(JLabel.CENTER); - add(label,BorderLayout.CENTER); + add(label, BorderLayout.CENTER); } - - public void setImage(byte data[]){ + + public void setImage(byte data[]) { ImageIcon icon = new ImageIcon(data); label.setIcon(icon); } - - public void setImage(Image image){ + + public void setImage(Image image) { ImageIcon icon = new ImageIcon(image); label.setIcon(icon); } - } diff --git a/trunk/src/com/jpexs/asdec/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/gui/MainFrame.java index 34dadba37..6bb7c4e00 100644 --- a/trunk/src/com/jpexs/asdec/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/MainFrame.java @@ -58,6 +58,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.border.BevelBorder; + /** * * @author Jindra @@ -80,7 +81,7 @@ public class MainFrame extends JFrame implements ActionListener { } statusLabel.setText(s); } - + public MainFrame(SWF swf) { setSize(1000, 700); tabPane = new JTabbedPane(); @@ -242,8 +243,8 @@ public class MainFrame extends JFrame implements ActionListener { tabPane.addTab("ActionScript3", abcPanel = new ABCPanel(abcList)); } else { actionPanel = new ActionPanel(swf.tags); - if(actionPanel.tagTree.getRowCount()>1){ - tabPane.addTab("ActionScript",actionPanel); + if (actionPanel.tagTree.getRowCount() > 1) { + tabPane.addTab("ActionScript", actionPanel); } } @@ -256,7 +257,7 @@ public class MainFrame extends JFrame implements ActionListener { statusPanel.add(loadingPanel, BorderLayout.WEST); statusPanel.add(statusLabel, BorderLayout.CENTER); loadingPanel.setVisible(false); - add(statusPanel, BorderLayout.SOUTH); + add(statusPanel, BorderLayout.SOUTH); View.centerScreen(this); Main.stopWork(); @@ -279,7 +280,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getShapes(((Container) t).getSubItems(), shapes); - } + } if ((t instanceof DefineShapeTag) || (t instanceof DefineShape2Tag) || (t instanceof DefineShape3Tag) @@ -293,7 +294,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getFonts(((Container) t).getSubItems(), fonts); - } + } if ((t instanceof DefineFontTag) || (t instanceof DefineFont2Tag) || (t instanceof DefineFont3Tag) @@ -307,7 +308,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getActionScript3(((Container) t).getSubItems(), actionScripts); - } + } if (t instanceof DoABCTag) { actionScripts.add((DoABCTag) t); } @@ -318,7 +319,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getMorphShapes(((Container) t).getSubItems(), morphShapes); - } + } if ((t instanceof DefineMorphShapeTag) || (t instanceof DefineMorphShape2Tag)) { morphShapes.add((Tag) t); } @@ -329,7 +330,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getImages(((Container) t).getSubItems(), images); - } + } if ((t instanceof DefineBitsTag) || (t instanceof DefineBitsJPEG2Tag) || (t instanceof DefineBitsJPEG3Tag) @@ -345,7 +346,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getTexts(((Container) t).getSubItems(), texts); - } + } if ((t instanceof DefineTextTag) || (t instanceof DefineText2Tag) || (t instanceof DefineEditTextTag)) { @@ -358,7 +359,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getSprites(((Container) t).getSubItems(), sprites); - } + } if (t instanceof DefineSpriteTag) { sprites.add((Tag) t); } @@ -369,7 +370,7 @@ public class MainFrame extends JFrame implements ActionListener { for (Object t : list) { if (t instanceof Container) { getButtons(((Container) t).getSubItems(), buttons); - } + } if ((t instanceof DefineButtonTag) || (t instanceof DefineButton2Tag)) { buttons.add((Tag) t); } diff --git a/trunk/src/com/jpexs/asdec/gui/TagNode.java b/trunk/src/com/jpexs/asdec/gui/TagNode.java index 1631162e1..2f76b9109 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagNode.java +++ b/trunk/src/com/jpexs/asdec/gui/TagNode.java @@ -16,7 +16,7 @@ */ package com.jpexs.asdec.gui; -import com.jpexs.asdec.action.*; +import com.jpexs.asdec.gui.TagNode; import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; import com.jpexs.asdec.tags.DefineBitsJPEG3Tag; import com.jpexs.asdec.tags.DefineBitsJPEG4Tag; @@ -80,103 +80,101 @@ public class TagNode { if (t instanceof ExportAssetsTag) { exportAssetsTags.add((ExportAssetsTag) t); } - if((t instanceof DefineFontTag)|| - (t instanceof DefineFont2Tag)|| - (t instanceof DefineFont3Tag)|| - (t instanceof DefineFont4Tag)){ + if ((t instanceof DefineFontTag) + || (t instanceof DefineFont2Tag) + || (t instanceof DefineFont3Tag) + || (t instanceof DefineFont4Tag)) { fonts.add(new TagNode(t)); } - if((t instanceof DefineTextTag)|| - (t instanceof DefineText2Tag) - ||(t instanceof DefineEditTextTag)){ + if ((t instanceof DefineTextTag) + || (t instanceof DefineText2Tag) + || (t instanceof DefineEditTextTag)) { texts.add(new TagNode(t)); } - - if((t instanceof DefineBitsTag)|| - (t instanceof DefineBitsJPEG2Tag)|| - (t instanceof DefineBitsJPEG3Tag)|| - (t instanceof DefineBitsJPEG4Tag)|| - (t instanceof DefineBitsLosslessTag)|| - (t instanceof DefineBitsLossless2Tag)){ + + if ((t instanceof DefineBitsTag) + || (t instanceof DefineBitsJPEG2Tag) + || (t instanceof DefineBitsJPEG3Tag) + || (t instanceof DefineBitsJPEG4Tag) + || (t instanceof DefineBitsLosslessTag) + || (t instanceof DefineBitsLossless2Tag)) { images.add(new TagNode(t)); } - if((t instanceof DefineShapeTag)|| - (t instanceof DefineShape2Tag)|| - (t instanceof DefineShape3Tag)|| - (t instanceof DefineShape4Tag)) - { + if ((t instanceof DefineShapeTag) + || (t instanceof DefineShape2Tag) + || (t instanceof DefineShape3Tag) + || (t instanceof DefineShape4Tag)) { shapes.add(new TagNode(t)); } - - if((t instanceof DefineMorphShapeTag)||(t instanceof DefineMorphShape2Tag)){ + + if ((t instanceof DefineMorphShapeTag) || (t instanceof DefineMorphShape2Tag)) { morphShapes.add(new TagNode(t)); } - - if(t instanceof DefineSpriteTag){ + + if (t instanceof DefineSpriteTag) { sprites.add(new TagNode(t)); } - if((t instanceof DefineButtonTag)||( - t instanceof DefineButton2Tag)){ + if ((t instanceof DefineButtonTag) || (t instanceof DefineButton2Tag)) { buttons.add(new TagNode(t)); } if (t instanceof ShowFrameTag) { TagNode tti = new TagNode("frame" + frame); - /* for (int r = ret.size() - 1; r >= 0; r--) { - if (!(ret.get(r).tag instanceof DefineSpriteTag)) { - if (!(ret.get(r).tag instanceof DefineButtonTag)) { - if (!(ret.get(r).tag instanceof DefineButton2Tag)) { - if (!(ret.get(r).tag instanceof DoInitActionTag)) { - tti.subItems.add(ret.get(r)); - ret.remove(r); - } - } - } - } - }*/ + /* for (int r = ret.size() - 1; r >= 0; r--) { + if (!(ret.get(r).tag instanceof DefineSpriteTag)) { + if (!(ret.get(r).tag instanceof DefineButtonTag)) { + if (!(ret.get(r).tag instanceof DefineButton2Tag)) { + if (!(ret.get(r).tag instanceof DoInitActionTag)) { + tti.subItems.add(ret.get(r)); + ret.remove(r); + } + } + } + } + }*/ frame++; frames.add(tti); } /*if (t instanceof ASMSource) { - TagNode tti = new TagNode(t); - ret.add(tti); - } else */ + TagNode tti = new TagNode(t); + ret.add(tti); + } else */ if (t instanceof Container) { TagNode tti = new TagNode(t); - if (((Container) t).getItemCount() > 0) { + if (((Container) t).getItemCount() > 0) { List subItems = ((Container) t).getSubItems(); - tti.subItems = createTagList(subItems); + tti.subItems = createTagList(subItems); } //ret.add(tti); } } - - TagNode textsNode=new TagNode("texts"); + + TagNode textsNode = new TagNode("texts"); textsNode.subItems.addAll(texts); - - TagNode imagesNode=new TagNode("images"); + + TagNode imagesNode = new TagNode("images"); imagesNode.subItems.addAll(images); - - TagNode fontsNode=new TagNode("fonts"); + + TagNode fontsNode = new TagNode("fonts"); fontsNode.subItems.addAll(fonts); - - - TagNode spritesNode=new TagNode("sprites"); + + + TagNode spritesNode = new TagNode("sprites"); spritesNode.subItems.addAll(sprites); - - TagNode shapesNode=new TagNode("shapes"); + + TagNode shapesNode = new TagNode("shapes"); shapesNode.subItems.addAll(shapes); - - TagNode morphShapesNode=new TagNode("morphshapes"); + + TagNode morphShapesNode = new TagNode("morphshapes"); morphShapesNode.subItems.addAll(morphShapes); - - TagNode buttonsNode=new TagNode("buttons"); + + TagNode buttonsNode = new TagNode("buttons"); buttonsNode.subItems.addAll(buttons); - - TagNode framesNode=new TagNode("frames"); + + TagNode framesNode = new TagNode("frames"); framesNode.subItems.addAll(frames); ret.add(shapesNode); ret.add(morphShapesNode);; - ret.add(spritesNode); + ret.add(spritesNode); ret.add(textsNode); ret.add(imagesNode); ret.add(buttonsNode); diff --git a/trunk/src/com/jpexs/asdec/gui/TagPanel.java b/trunk/src/com/jpexs/asdec/gui/TagPanel.java index f7078e139..c3b1b036c 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagPanel.java +++ b/trunk/src/com/jpexs/asdec/gui/TagPanel.java @@ -16,7 +16,6 @@ */ package com.jpexs.asdec.gui; -import com.jpexs.flashplayer.FlashPanel; import com.jpexs.asdec.SWF; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; @@ -52,6 +51,7 @@ import com.jpexs.asdec.types.MATRIX; import com.jpexs.asdec.types.RECT; import com.jpexs.asdec.types.RGB; import com.jpexs.asdec.types.TEXTRECORD; +import com.jpexs.flashplayer.FlashPanel; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; @@ -64,8 +64,6 @@ import java.util.List; import javax.swing.BorderFactory; import javax.swing.JList; import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -87,17 +85,17 @@ public class TagPanel extends JPanel implements ListSelectionListener { public TagPanel(List list, SWF swf) { this.swf = swf; - for(Tag t:swf.tags){ - if(t instanceof JPEGTablesTag){ - jtt=(JPEGTablesTag)t; + for (Tag t : swf.tags) { + if (t instanceof JPEGTablesTag) { + jtt = (JPEGTablesTag) t; } } tagList = new JList(list.toArray(new Tag[list.size()])); tagList.addListSelectionListener(this); - tagList.setPreferredSize(new Dimension(200,1)); + tagList.setPreferredSize(new Dimension(200, 1)); tagList.setSize(200, 1); - setLayout(new BorderLayout()); - flashPanel = new FlashPanel(); + setLayout(new BorderLayout()); + flashPanel = new FlashPanel(); displayPanel = new JPanel(new CardLayout()); displayPanel.add(flashPanel, CARDFLASHPANEL); imagePanel = new ImagePanel(); @@ -105,47 +103,41 @@ public class TagPanel extends JPanel implements ListSelectionListener { cl.show(displayPanel, CARDEMPTYPANEL); displayPanel.add(imagePanel, CARDIMAGEPANEL); displayPanel.add(new JPanel(), CARDEMPTYPANEL); - + tagList.setBorder(BorderFactory.createLoweredBevelBorder()); displayPanel.setBorder(BorderFactory.createLineBorder(Color.black)); - add(tagList,BorderLayout.WEST); + add(tagList, BorderLayout.WEST); add(displayPanel, BorderLayout.CENTER); } private File tempFile; - public void showCard(String card){ + public void showCard(String card) { CardLayout cl = (CardLayout) (displayPanel.getLayout()); cl.show(displayPanel, card); } - + @Override public void valueChanged(ListSelectionEvent e) { Tag tagObj = (Tag) tagList.getSelectedValue(); - if(tagObj instanceof DefineBitsTag){ + if (tagObj instanceof DefineBitsTag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsTag)tagObj).getFullImageData(jtt)); - }else - if(tagObj instanceof DefineBitsJPEG2Tag){ + imagePanel.setImage(((DefineBitsTag) tagObj).getFullImageData(jtt)); + } else if (tagObj instanceof DefineBitsJPEG2Tag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsJPEG2Tag)tagObj).imageData); - }else - if(tagObj instanceof DefineBitsJPEG3Tag){ + imagePanel.setImage(((DefineBitsJPEG2Tag) tagObj).imageData); + } else if (tagObj instanceof DefineBitsJPEG3Tag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsJPEG3Tag)tagObj).imageData); - }else - if(tagObj instanceof DefineBitsJPEG4Tag){ + imagePanel.setImage(((DefineBitsJPEG3Tag) tagObj).imageData); + } else if (tagObj instanceof DefineBitsJPEG4Tag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsJPEG4Tag)tagObj).imageData); - }else - if(tagObj instanceof DefineBitsLosslessTag){ + imagePanel.setImage(((DefineBitsJPEG4Tag) tagObj).imageData); + } else if (tagObj instanceof DefineBitsLosslessTag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsLosslessTag)tagObj).getImage()); - }else - if(tagObj instanceof DefineBitsLossless2Tag){ + imagePanel.setImage(((DefineBitsLosslessTag) tagObj).getImage()); + } else if (tagObj instanceof DefineBitsLossless2Tag) { showCard(CARDIMAGEPANEL); - imagePanel.setImage(((DefineBitsLossless2Tag)tagObj).getImage()); - } else - if (((tagObj instanceof CharacterTag) || (tagObj instanceof FontTag)) && (tagObj instanceof Tag)) { + imagePanel.setImage(((DefineBitsLossless2Tag) tagObj).getImage()); + } else if (((tagObj instanceof CharacterTag) || (tagObj instanceof FontTag)) && (tagObj instanceof Tag)) { try { if (tempFile != null) { @@ -267,13 +259,13 @@ public class TagPanel extends JPanel implements ListSelectionListener { sos.writeUI32(sos.getPos() + data.length + 4); sos.write(data); fos.close(); - showCard(CARDFLASHPANEL); + showCard(CARDFLASHPANEL); flashPanel.displaySWF(tempFile.getAbsolutePath()); } catch (Exception ex) { ex.printStackTrace(); } - + } } } diff --git a/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java b/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java index ec60447e5..980c65eeb 100644 --- a/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java @@ -58,7 +58,7 @@ public class DebugIDTag extends Tag { * @throws IOException */ public DebugIDTag(byte data[], int version, long pos) throws IOException { - super(63,"DebugID", data, pos); + super(63, "DebugID", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); debugId = sis.readBytes(16); } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java b/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java index 48530dc23..ddc4984c0 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java @@ -48,7 +48,7 @@ public class DefineBinaryDataTag extends Tag { } public DefineBinaryDataTag(byte[] data, int version, long pos) throws IOException { - super(87,"DefineBinaryData", data, pos); + super(87, "DefineBinaryData", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); tag = sis.readUI16(); binaryData = sis.readBytes(sis.available()); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java index 2077b97bf..3119c227c 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java @@ -21,19 +21,18 @@ import com.jpexs.asdec.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.IOException; -public class DefineBitsJPEG2Tag extends CharacterTag{ +public class DefineBitsJPEG2Tag extends CharacterTag { public int characterID; public byte[] imageData; - - + @Override public int getCharacterID() { return characterID; } public DefineBitsJPEG2Tag(byte[] data, int version, long pos) throws IOException { - super(21,"DefineBitsJPEG2", data, pos); + super(21, "DefineBitsJPEG2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); imageData = sis.readBytes(sis.available()); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java index 371458718..c23228068 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java @@ -29,15 +29,14 @@ public class DefineBitsJPEG3Tag extends CharacterTag { public int characterID; public byte imageData[]; public byte bitmapAlphaData[]; - - + @Override public int getCharacterID() { return characterID; } public DefineBitsJPEG3Tag(byte[] data, int version, long pos) throws IOException { - super(35,"DefineBitsJPEG3", data, pos); + super(35, "DefineBitsJPEG3", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); long alphaDataOffset = sis.readUI32(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java index 251d5974e..a1b49d7c4 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java @@ -36,12 +36,11 @@ public class DefineBitsJPEG4Tag extends CharacterTag { public byte imageData[]; public byte bitmapAlphaData[]; - @Override public int getCharacterID() { return characterID; } - + /** * Gets data bytes * @@ -72,7 +71,7 @@ public class DefineBitsJPEG4Tag extends CharacterTag { * @throws IOException */ public DefineBitsJPEG4Tag(byte data[], int version, long pos) throws IOException { - super(90, "DefineBitsJPEG4",data, pos); + super(90, "DefineBitsJPEG4", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); long alphaDataOffset = sis.readUI32(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java index 409f74077..590d90488 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java @@ -43,15 +43,13 @@ public class DefineBitsLossless2Tag extends CharacterTag { public static final int FORMAT_15BIT_RGB = 4; public static final int FORMAT_24BIT_RGB = 5; - - @Override public int getCharacterID() { return characterID; } - + public DefineBitsLossless2Tag(byte[] data, int version, long pos) throws IOException { - super(36,"DefineBitsLossless2", data, pos); + super(36, "DefineBitsLossless2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); bitmapFormat = sis.readUI8(); @@ -121,34 +119,34 @@ public class DefineBitsLossless2Tag extends CharacterTag { public BufferedImage getImage() { BufferedImage bi = new BufferedImage(bitmapWidth, bitmapHeight, BufferedImage.TYPE_INT_ARGB); - Graphics g = bi.getGraphics(); - ALPHACOLORMAPDATA colorMapData = null; - ALPHABITMAPDATA bitmapData = null; - if (bitmapFormat == DefineBitsLossless2Tag.FORMAT_8BIT_COLORMAPPED) { - colorMapData = getColorMapData(); + Graphics g = bi.getGraphics(); + ALPHACOLORMAPDATA colorMapData = null; + ALPHABITMAPDATA bitmapData = null; + if (bitmapFormat == DefineBitsLossless2Tag.FORMAT_8BIT_COLORMAPPED) { + colorMapData = getColorMapData(); + } + if ((bitmapFormat == DefineBitsLossless2Tag.FORMAT_15BIT_RGB) || (bitmapFormat == DefineBitsLossless2Tag.FORMAT_24BIT_RGB)) { + bitmapData = getBitmapData(); + } + int pos32aligned = 0; + int pos = 0; + for (int y = 0; y < bitmapHeight; y++) { + for (int x = 0; x < bitmapWidth; x++) { + if ((bitmapFormat == DefineBitsLossless2Tag.FORMAT_8BIT_COLORMAPPED)) { + RGBA color = colorMapData.colorTableRGB[colorMapData.colorMapPixelData[pos32aligned]]; + g.setColor(new Color(color.red, color.green, color.blue, color.alpha)); } if ((bitmapFormat == DefineBitsLossless2Tag.FORMAT_15BIT_RGB) || (bitmapFormat == DefineBitsLossless2Tag.FORMAT_24BIT_RGB)) { - bitmapData = getBitmapData(); + g.setColor(new Color(bitmapData.bitmapPixelData[pos].red, bitmapData.bitmapPixelData[pos].green, bitmapData.bitmapPixelData[pos].blue, bitmapData.bitmapPixelData[pos].alpha)); } - int pos32aligned = 0; - int pos = 0; - for (int y = 0; y < bitmapHeight; y++) { - for (int x = 0; x < bitmapWidth; x++) { - if ((bitmapFormat == DefineBitsLossless2Tag.FORMAT_8BIT_COLORMAPPED)) { - RGBA color = colorMapData.colorTableRGB[colorMapData.colorMapPixelData[pos32aligned]]; - g.setColor(new Color(color.red, color.green, color.blue, color.alpha)); - } - if ((bitmapFormat == DefineBitsLossless2Tag.FORMAT_15BIT_RGB) || (bitmapFormat == DefineBitsLossless2Tag.FORMAT_24BIT_RGB)) { - g.setColor(new Color(bitmapData.bitmapPixelData[pos].red, bitmapData.bitmapPixelData[pos].green, bitmapData.bitmapPixelData[pos].blue, bitmapData.bitmapPixelData[pos].alpha)); - } - g.fillRect(x, y, 1, 1); - pos32aligned++; - pos++; - } - while ((pos32aligned % 4 != 0)) { - pos32aligned++; - } - } - return bi; + g.fillRect(x, y, 1, 1); + pos32aligned++; + pos++; + } + while ((pos32aligned % 4 != 0)) { + pos32aligned++; + } + } + return bi; } } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java index 3048ea1b9..2daa0fb62 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java @@ -24,7 +24,6 @@ import com.jpexs.asdec.types.COLORMAPDATA; import com.jpexs.asdec.types.RGB; import java.awt.Color; import java.awt.Graphics; -import java.awt.Image; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,8 +46,6 @@ public class DefineBitsLosslessTag extends CharacterTag { private BITMAPDATA bitmapData; private boolean decompressed = false; - - public BufferedImage getImage() { BufferedImage bi = new BufferedImage(bitmapWidth, bitmapHeight, BufferedImage.TYPE_INT_RGB); Graphics g = bi.getGraphics(); @@ -77,7 +74,7 @@ public class DefineBitsLosslessTag extends CharacterTag { g.fillRect(x, y, 1, 1); pos32aligned++; pos++; - } + } while ((pos32aligned % 4 != 0)) { pos32aligned++; } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java b/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java index da39b5e5c..f12965c3a 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java @@ -22,8 +22,6 @@ import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -45,14 +43,14 @@ public class DefineBitsTag extends CharacterTag { try { baos = new ByteArrayOutputStream(); - byte jttdata[] = jtt.getData(10); - if(jttdata.length!=0){ + byte jttdata[] = jtt.getData(10); + if (jttdata.length != 0) { baos.write(jttdata, SWF.hasErrorHeader(jttdata) ? 4 : 0, jttdata.length - (SWF.hasErrorHeader(jttdata) ? 6 : 2)); - baos.write(jpegData, SWF.hasErrorHeader(jpegData) ? 6 : 2, jpegData.length - (SWF.hasErrorHeader(jttdata) ? 6 : 2)); - }else{ - baos.write(jpegData,0,jpegData.length); + baos.write(jpegData, SWF.hasErrorHeader(jpegData) ? 6 : 2, jpegData.length - (SWF.hasErrorHeader(jttdata) ? 6 : 2)); + } else { + baos.write(jpegData, 0, jpegData.length); } - + } finally { if (baos != null) { try { diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java index f8840acc4..fcc380281 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java @@ -62,7 +62,7 @@ public class DefineButton2Tag extends CharacterTag implements Container { public int getCharacterID() { return buttonId; } - + /** * Constructor * @@ -71,7 +71,7 @@ public class DefineButton2Tag extends CharacterTag implements Container { * @throws IOException */ public DefineButton2Tag(byte data[], int version, long pos) throws IOException { - super(34,"DefineButton2", data, pos); + super(34, "DefineButton2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); buttonId = sis.readUI16(); sis.readUB(7); //reserved diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java b/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java index c0bb4eb06..e959bd3b5 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java @@ -61,7 +61,7 @@ public class DefineButtonCxformTag extends Tag { * @throws IOException */ public DefineButtonCxformTag(byte data[], int version, long pos) throws IOException { - super(23, "DefineButtonCxform",data, pos); + super(23, "DefineButtonCxform", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); buttonId = sis.readUI16(); buttonColorTransform = sis.readCXFORM(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java b/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java index 4bcbcbecb..f10d6397f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java @@ -30,7 +30,7 @@ import java.io.OutputStream; * * @author JPEXS */ -public class DefineButtonSoundTag extends CharacterTag{ +public class DefineButtonSoundTag extends CharacterTag { public int buttonId; public int buttonSoundChar0; @@ -42,12 +42,11 @@ public class DefineButtonSoundTag extends CharacterTag{ public int buttonSoundChar3; public SOUNDINFO buttonSoundInfo3; - @Override public int getCharacterID() { return buttonId; } - + /** * Gets data bytes * @@ -90,7 +89,7 @@ public class DefineButtonSoundTag extends CharacterTag{ * @throws IOException */ public DefineButtonSoundTag(byte data[], int version, long pos) throws IOException { - super(17, "DefineButtonSound",data, pos); + super(17, "DefineButtonSound", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); buttonId = sis.readUI16(); buttonSoundChar0 = sis.readUI16(); @@ -110,5 +109,4 @@ public class DefineButtonSoundTag extends CharacterTag{ buttonSoundInfo3 = sis.readSOUNDINFO(); } } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java index 5583495b4..9e5d891bb 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java @@ -53,12 +53,12 @@ public class DefineButtonTag extends CharacterTag implements ASMSource { */ //public List actions; public byte[] actionBytes; - + @Override public int getCharacterID() { return buttonId; } - + /** * Constructor * @@ -67,7 +67,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource { * @throws IOException */ public DefineButtonTag(byte[] data, int version, long pos) throws IOException { - super(7, "DefineButton",data, pos); + super(7, "DefineButton", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); buttonId = sis.readUI16(); characters = sis.readBUTTONRECORDList(false); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java index 9535bda80..17f0eb32f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java @@ -63,7 +63,7 @@ public class DefineEditTextTag extends CharacterTag { public int leading; public String variableName; public String initialText; - + @Override public int getCharacterID() { return characterID; @@ -187,5 +187,4 @@ public class DefineEditTextTag extends CharacterTag { } } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java index 2f39430c7..c55936607 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; import com.jpexs.asdec.tags.base.FontTag; import com.jpexs.asdec.types.KERNINGRECORD; import com.jpexs.asdec.types.LANGCODE; @@ -146,7 +145,7 @@ public class DefineFont2Tag extends Tag implements FontTag { * @throws IOException */ public DefineFont2Tag(byte data[], int version, long pos) throws IOException { - super(48,"DefineFont2", data, pos); + super(48, "DefineFont2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontId = sis.readUI16(); fontFlagsHasLayout = sis.readUB(1) == 1; @@ -208,5 +207,4 @@ public class DefineFont2Tag extends Tag implements FontTag { } } } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java index 78612da07..53213e1a4 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; import com.jpexs.asdec.tags.base.FontTag; import com.jpexs.asdec.types.KERNINGRECORD; import com.jpexs.asdec.types.LANGCODE; @@ -55,7 +54,7 @@ public class DefineFont3Tag extends Tag implements FontTag { public KERNINGRECORD fontKerningTable[]; public DefineFont3Tag(byte[] data, int version, long pos) throws IOException { - super(75, "DefineFont3",data, pos); + super(75, "DefineFont3", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontId = sis.readUI16(); fontFlagsHasLayout = sis.readUB(1) == 1; @@ -127,7 +126,7 @@ public class DefineFont3Tag extends Tag implements FontTag { ByteArrayOutputStream baos = new ByteArrayOutputStream(); OutputStream os = baos; SWFOutputStream sos = new SWFOutputStream(os, version); - sos=new SWFOutputStream(new CopyOutputStream(sos, new ByteArrayInputStream(data)), 10); + sos = new SWFOutputStream(new CopyOutputStream(sos, new ByteArrayInputStream(data)), 10); try { sos.writeUI16(fontId); sos.writeUB(1, fontFlagsHasLayout ? 1 : 0); @@ -199,5 +198,4 @@ public class DefineFont3Tag extends Tag implements FontTag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java index 87a551e75..b80b74d42 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java @@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -public class DefineFont4Tag extends CharacterTag{ +public class DefineFont4Tag extends CharacterTag { public int fontID; public boolean fontFlagsHasFontData; @@ -32,14 +32,14 @@ public class DefineFont4Tag extends CharacterTag{ public boolean fontFlagsBold; public String fontName; public byte fontData[]; - + @Override public int getCharacterID() { return fontID; } public DefineFont4Tag(byte[] data, int version, long pos) throws IOException { - super(91,"DefineFont4", data, pos); + super(91, "DefineFont4", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontID = sis.readUI16(); sis.readUB(5); @@ -73,5 +73,4 @@ public class DefineFont4Tag extends CharacterTag{ } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java b/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java index caa1533bf..2e2c3ce5b 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java @@ -33,7 +33,7 @@ public class DefineFontAlignZonesTag extends Tag { public List zoneTable; public DefineFontAlignZonesTag(byte[] data, int version, long pos) throws IOException { - super(73, "DefineFontAlignZones",data, pos); + super(73, "DefineFontAlignZones", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontID = sis.readUI16(); CSMTableHint = (int) sis.readUB(2); @@ -67,5 +67,4 @@ public class DefineFontAlignZonesTag extends Tag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java index 0c4d6d8aa..f151af55f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java @@ -81,7 +81,7 @@ public class DefineFontInfo2Tag extends Tag { * @throws IOException */ public DefineFontInfo2Tag(byte data[], int version, long pos) throws IOException { - super(62,"DefineFontInfo2", data, pos); + super(62, "DefineFontInfo2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontID = sis.readUI16(); int fontNameLen = sis.readUI8(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java b/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java index 599845e23..6a318f988 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java @@ -84,7 +84,7 @@ public class DefineFontInfoTag extends Tag { * @throws IOException */ public DefineFontInfoTag(byte data[], int version, long pos) throws IOException { - super(13,"DefineFontInfo", data, pos); + super(13, "DefineFontInfo", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontId = sis.readUI16(); int fontNameLen = sis.readUI8(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java b/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java index 3ef329a36..f6fad055f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java @@ -27,7 +27,7 @@ public class DefineFontNameTag extends Tag { public String fontCopyright; public DefineFontNameTag(byte[] data, int version, long pos) throws IOException { - super(88,"DefineFontName", data, pos); + super(88, "DefineFontName", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontId = sis.readUI16(); fontName = sis.readString(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java b/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java index 5190e512f..9f2eaad8d 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; import com.jpexs.asdec.tags.base.FontTag; import com.jpexs.asdec.types.SHAPE; import java.io.ByteArrayInputStream; @@ -31,7 +30,7 @@ import java.io.OutputStream; * * @author JPEXS */ -public class DefineFontTag extends Tag implements FontTag{ +public class DefineFontTag extends Tag implements FontTag { public int fontId; public int offsetTable[]; @@ -69,7 +68,7 @@ public class DefineFontTag extends Tag implements FontTag{ * @throws IOException */ public DefineFontTag(byte data[], int version, long pos) throws IOException { - super(10,"DefineFont", data, pos); + super(10, "DefineFont", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); fontId = sis.readUI16(); int firstOffset = sis.readUI16(); @@ -84,5 +83,4 @@ public class DefineFontTag extends Tag implements FontTag{ glyphShapeTable[i] = sis.readSHAPE(1); } } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java index bebe377f3..542ca143c 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java @@ -50,19 +50,19 @@ public class DefineMorphShape2Tag extends CharacterTag implements BoundedTag { @Override public RECT getRect() { - RECT rect=new RECT(); - rect.Xmin=Math.min(startBounds.Xmin,endBounds.Xmin); - rect.Ymin=Math.min(startBounds.Ymin,endBounds.Ymin); - rect.Xmax=Math.max(startBounds.Xmax,endBounds.Xmax); - rect.Ymax=Math.max(startBounds.Ymax,endBounds.Ymax); + RECT rect = new RECT(); + rect.Xmin = Math.min(startBounds.Xmin, endBounds.Xmin); + rect.Ymin = Math.min(startBounds.Ymin, endBounds.Ymin); + rect.Xmax = Math.max(startBounds.Xmax, endBounds.Xmax); + rect.Ymax = Math.max(startBounds.Ymax, endBounds.Ymax); return rect; } - + @Override public int getCharacterID() { return characterId; } - + /** * Gets data bytes * @@ -121,5 +121,4 @@ public class DefineMorphShape2Tag extends CharacterTag implements BoundedTag { startEdges = sis.readSHAPE(1); endEdges = sis.readSHAPE(1); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java index 181d62ab8..c745708be 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java @@ -34,7 +34,7 @@ import java.io.OutputStream; * * @author JPEXS */ -public class DefineMorphShapeTag extends CharacterTag implements BoundedTag{ +public class DefineMorphShapeTag extends CharacterTag implements BoundedTag { public int characterId; public RECT startBounds; @@ -49,7 +49,6 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag{ return characterId; } - /** * Gets data bytes * @@ -88,7 +87,7 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag{ * @throws IOException */ public DefineMorphShapeTag(byte data[], int version, long pos) throws IOException { - super(46,"DefineMorphShape", data, pos); + super(46, "DefineMorphShape", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterId = sis.readUI16(); startBounds = sis.readRECT(); @@ -100,14 +99,13 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag{ endEdges = sis.readSHAPE(1); } - @Override public RECT getRect() { - RECT rect=new RECT(); - rect.Xmin=Math.min(startBounds.Xmin,endBounds.Xmin); - rect.Ymin=Math.min(startBounds.Ymin,endBounds.Ymin); - rect.Xmax=Math.max(startBounds.Xmax,endBounds.Xmax); - rect.Ymax=Math.max(startBounds.Ymax,endBounds.Ymax); + RECT rect = new RECT(); + rect.Xmin = Math.min(startBounds.Xmin, endBounds.Xmin); + rect.Ymin = Math.min(startBounds.Ymin, endBounds.Ymin); + rect.Xmax = Math.max(startBounds.Xmax, endBounds.Xmax); + rect.Ymax = Math.max(startBounds.Ymax, endBounds.Ymax); return rect; } } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java b/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java index 0d2b400b9..4c341d2d9 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java @@ -33,7 +33,7 @@ public class DefineScalingGridTag extends Tag { private RECT splitter; public DefineScalingGridTag(byte[] data, int version, long pos) throws IOException { - super(78, "DefineScalingGrid",data, pos); + super(78, "DefineScalingGrid", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterId = sis.readUI16(); splitter = sis.readRECT(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java index 720c9a5ec..0260a341a 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java @@ -72,7 +72,7 @@ public class DefineSceneAndFrameLabelDataTag extends Tag { * @throws IOException */ public DefineSceneAndFrameLabelDataTag(byte data[], int version, long pos) throws IOException { - super(86, "DefineSceneAndFrameLabelData",data, pos); + super(86, "DefineSceneAndFrameLabelData", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); int sceneCount = (int) sis.readEncodedU32(); sceneOffsets = new long[sceneCount]; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java index d8758249c..701b97fa7 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java @@ -23,32 +23,28 @@ import com.jpexs.asdec.types.RECT; import com.jpexs.asdec.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -public class DefineShape2Tag extends CharacterTag implements BoundedTag{ +public class DefineShape2Tag extends CharacterTag implements BoundedTag { public int shapeId; public RECT shapeBounds; public SHAPEWITHSTYLE shapes; - @Override public int getCharacterID() { return shapeId; } - + @Override public RECT getRect() { return shapeBounds; } - + public DefineShape2Tag(byte[] data, int version, long pos) throws IOException { - super(22, "DefineShape2",data, pos); + super(22, "DefineShape2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); shapeId = sis.readUI16(); shapeBounds = sis.readRECT(); shapes = sis.readSHAPEWITHSTYLE(2); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java index 1e3ddb691..3889d6c9a 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java @@ -23,14 +23,13 @@ import com.jpexs.asdec.types.RECT; import com.jpexs.asdec.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -public class DefineShape3Tag extends CharacterTag implements BoundedTag{ +public class DefineShape3Tag extends CharacterTag implements BoundedTag { public int shapeId; public RECT shapeBounds; public SHAPEWITHSTYLE shapes; + @Override public RECT getRect() { return shapeBounds; @@ -40,9 +39,9 @@ public class DefineShape3Tag extends CharacterTag implements BoundedTag{ public int getCharacterID() { return shapeId; } - + public DefineShape3Tag(byte[] data, int version, long pos) throws IOException { - super(32,"DefineShape3", data, pos); + super(32, "DefineShape3", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); shapeId = sis.readUI16(); shapeBounds = sis.readRECT(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java index 7fd2da444..c155c66b2 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java @@ -23,10 +23,8 @@ import com.jpexs.asdec.types.RECT; import com.jpexs.asdec.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -public class DefineShape4Tag extends CharacterTag implements BoundedTag{ +public class DefineShape4Tag extends CharacterTag implements BoundedTag { public int shapeId; public RECT shapeBounds; @@ -40,12 +38,12 @@ public class DefineShape4Tag extends CharacterTag implements BoundedTag{ public int getCharacterID() { return shapeId; } - + @Override public RECT getRect() { return shapeBounds; } - + public DefineShape4Tag(byte[] data, int version, long pos) throws IOException { super(83, "DefineShape4", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java b/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java index e3331a499..9cc3003f9 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java @@ -23,8 +23,6 @@ import com.jpexs.asdec.types.RECT; import com.jpexs.asdec.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; public class DefineShapeTag extends CharacterTag implements BoundedTag { @@ -37,10 +35,8 @@ public class DefineShapeTag extends CharacterTag implements BoundedTag { return shapeBounds; } - - public DefineShapeTag(byte[] data, int version, long pos) throws IOException { - super(2,"DefineShape", data, pos); + super(2, "DefineShape", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); shapeId = sis.readUI16(); shapeBounds = sis.readRECT(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java index 45aa5a467..66b55a65e 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java @@ -50,7 +50,7 @@ public class DefineSoundTag extends CharacterTag { public int getCharacterID() { return soundId; } - + /** * Gets data bytes * @@ -82,7 +82,7 @@ public class DefineSoundTag extends CharacterTag { * @throws IOException */ public DefineSoundTag(byte data[], int version, long pos) throws IOException { - super(14,"DefineSound", data, pos); + super(14, "DefineSound", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); soundId = sis.readUI16(); soundFormat = (int) sis.readUB(4); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java index 88a16b6a1..43f00764d 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java @@ -46,16 +46,13 @@ public class DefineSpriteTag extends CharacterTag implements Container { * A series of tags */ public List subTags; - private int level; + private int level; @Override public int getCharacterID() { return spriteId; } - - - /** * Constructor * @@ -64,7 +61,7 @@ public class DefineSpriteTag extends CharacterTag implements Container { * @throws IOException */ public DefineSpriteTag(byte[] data, int version, int level, long pos) throws IOException { - super(39,"DefineSprite", data, pos); + super(39, "DefineSprite", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version, pos); spriteId = sis.readUI16(); frameCount = sis.readUI16(); @@ -100,8 +97,6 @@ public class DefineSpriteTag extends CharacterTag implements Container { return baos.toByteArray(); } - - /** * Returns all sub-items * diff --git a/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java index 106b0f1d4..00b31637e 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java @@ -34,7 +34,7 @@ import java.util.List; * * @author JPEXS */ -public class DefineText2Tag extends CharacterTag { +public class DefineText2Tag extends CharacterTag { public int characterID; public RECT textBounds; @@ -47,7 +47,7 @@ public class DefineText2Tag extends CharacterTag { public int getCharacterID() { return characterID; } - + /** * Gets data bytes * @@ -82,7 +82,7 @@ public class DefineText2Tag extends CharacterTag { * @throws IOException */ public DefineText2Tag(byte data[], int version, long pos) throws IOException { - super(33,"DefineText2", data, pos); + super(33, "DefineText2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); textBounds = sis.readRECT(); @@ -95,5 +95,4 @@ public class DefineText2Tag extends CharacterTag { textRecords.add(tr); } } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java b/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java index 97031ac4c..1e52d74f7 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java @@ -34,7 +34,7 @@ import java.util.List; * * @author JPEXS */ -public class DefineTextTag extends CharacterTag{ +public class DefineTextTag extends CharacterTag { public int characterID; public RECT textBounds; @@ -49,7 +49,7 @@ public class DefineTextTag extends CharacterTag{ } public DefineTextTag(int characterID, RECT textBounds, MATRIX textMatrix, int glyphBits, int advanceBits, List textRecords) { - super(11,"DefineText", new byte[0], 0); + super(11, "DefineText", new byte[0], 0); this.characterID = characterID; this.textBounds = textBounds; this.textMatrix = textMatrix; @@ -58,8 +58,6 @@ public class DefineTextTag extends CharacterTag{ this.textRecords = textRecords; } - - /** * Gets data bytes * @@ -94,7 +92,7 @@ public class DefineTextTag extends CharacterTag{ * @throws IOException */ public DefineTextTag(byte data[], int version, long pos) throws IOException { - super(11,"DefineText", data, pos); + super(11, "DefineText", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); textBounds = sis.readRECT(); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java b/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java index 42b2132fc..4764d4c30 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java @@ -43,7 +43,7 @@ public class DefineVideoStreamTag extends CharacterTag { public int getCharacterID() { return characterID; } - + /** * Gets data bytes * @@ -77,7 +77,7 @@ public class DefineVideoStreamTag extends CharacterTag { * @throws IOException */ public DefineVideoStreamTag(byte data[], int version, long pos) throws IOException { - super(60, "DefineVideoStream",data, pos); + super(60, "DefineVideoStream", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterID = sis.readUI16(); numFrames = sis.readUI16(); @@ -88,5 +88,4 @@ public class DefineVideoStreamTag extends CharacterTag { videoFlagsSmoothing = sis.readUB(1) == 1; codecID = sis.readUI8(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java index e5fefe980..91ed2e92e 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java @@ -44,13 +44,10 @@ public class DoABCTag extends Tag implements Comparable { */ public String name; - @Override public String getName() { return "DoABC (" + name + ")"; } - - /** * Constructor @@ -60,7 +57,7 @@ public class DoABCTag extends Tag implements Comparable { * @throws IOException */ public DoABCTag(byte[] data, int version, long pos) throws IOException { - super(82,"DoABC",data, pos); + super(82, "DoABC", data, pos); InputStream is = new ByteArrayInputStream(data); SWFInputStream sis = new SWFInputStream(is, version); flags = sis.readUI32(); diff --git a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java index 6cbcdd759..6bc25c453 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java @@ -46,7 +46,7 @@ public class DoActionTag extends Tag implements ASMSource { * @throws IOException */ public DoActionTag(byte[] data, int version, long pos) { - super(12, "DoAction",data, pos); + super(12, "DoAction", data, pos); try { ByteArrayInputStream bais = new ByteArrayInputStream(data); SWFInputStream sis = new SWFInputStream(bais, version); diff --git a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java index dabc70612..e9d3d78e5 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java @@ -39,7 +39,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource { * List of actions to perform */ //public List actions = new ArrayList(); - public byte[] actionBytes; + public byte[] actionBytes; /** * Constructor @@ -49,7 +49,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource { * @throws IOException */ public DoInitActionTag(byte[] data, int version, long pos) throws IOException { - super(59, "DoInitAction",data, pos); + super(59, "DoInitAction", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); spriteId = sis.readUI16(); //actions = sis.readActionList(); @@ -74,7 +74,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource { } catch (IOException e) { } return baos.toByteArray(); - } + } /** * Whether or not this object contains ASM source diff --git a/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java b/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java index 56bce07c0..148f753f3 100644 --- a/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java @@ -64,10 +64,9 @@ public class EnableDebugger2Tag extends Tag { * @throws IOException */ public EnableDebugger2Tag(byte data[], int version, long pos) throws IOException { - super(64,"EnableDebugger2", data, pos); + super(64, "EnableDebugger2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); reserved = sis.readUI16(); passwordHash = sis.readString(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java b/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java index 626ab210a..857d991ce 100644 --- a/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java +++ b/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java @@ -63,7 +63,7 @@ public class EnableDebuggerTag extends Tag { * @throws IOException */ public EnableDebuggerTag(byte data[], int version, long pos) throws IOException { - super(58,"EnableDebugger", data, pos); + super(58, "EnableDebugger", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); passwordHash = sis.readString(); } diff --git a/trunk/src/com/jpexs/asdec/tags/EndTag.java b/trunk/src/com/jpexs/asdec/tags/EndTag.java index 0d648658b..94ce45340 100644 --- a/trunk/src/com/jpexs/asdec/tags/EndTag.java +++ b/trunk/src/com/jpexs/asdec/tags/EndTag.java @@ -44,13 +44,11 @@ public class EndTag extends Tag { * @throws IOException */ public EndTag(byte data[], int version, long pos) throws IOException { - super(0,"End", data, pos); + super(0, "End", data, pos); } public EndTag() { - super(0,"End", new byte[0], 0); + super(0, "End", new byte[0], 0); } - - } diff --git a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java index 267439568..a04f098d4 100644 --- a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java @@ -46,7 +46,7 @@ public class ExportAssetsTag extends Tag { * @throws IOException */ public ExportAssetsTag(byte[] data, int version, long pos) throws IOException { - super(56, "ExportAssets",data, pos); + super(56, "ExportAssets", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); int count = sis.readUI16(); tags = new ArrayList(); @@ -80,5 +80,4 @@ public class ExportAssetsTag extends Tag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java b/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java index 8fc8174a1..603b9e354 100644 --- a/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java +++ b/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java @@ -35,7 +35,7 @@ public class FileAttributesTag extends Tag { private int reserved3; public FileAttributesTag(byte[] data, int version, long pos) throws IOException { - super(69,"FileAttributes", data, pos); + super(69, "FileAttributes", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); reserved1 = (int) sis.readUB(1); // reserved // UB[1] == 0 (reserved) @@ -73,5 +73,4 @@ public class FileAttributesTag extends Tag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java b/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java index 60fb3f747..7891b88d0 100644 --- a/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java +++ b/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java @@ -29,7 +29,7 @@ public class FrameLabelTag extends Tag { private boolean namedAnchor = false; public FrameLabelTag(byte[] data, int version, long pos) throws IOException { - super(43,"FrameLabel", data, pos); + super(43, "FrameLabel", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); name = sis.readString(); if (sis.available() > 0) { @@ -39,7 +39,6 @@ public class FrameLabelTag extends Tag { } } - /** * Gets data bytes * diff --git a/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java b/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java index 7aa3b0377..cc1b2f61c 100644 --- a/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java @@ -45,7 +45,7 @@ public class ImportAssets2Tag extends Tag { * @throws IOException */ public ImportAssets2Tag(byte data[], int version, long pos) throws IOException { - super(57, "ImportAssets2",data, pos); + super(57, "ImportAssets2", data, pos); assets = new HashMap(); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); url = sis.readString(); @@ -83,5 +83,4 @@ public class ImportAssets2Tag extends Tag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java b/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java index c6bafca31..ddbcfe307 100644 --- a/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java @@ -45,7 +45,7 @@ public class ImportAssetsTag extends Tag { * @throws IOException */ public ImportAssetsTag(byte data[], int version, long pos) throws IOException { - super(57,"ImportAssets", data, pos); + super(57, "ImportAssets", data, pos); assets = new HashMap(); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); url = sis.readString(); diff --git a/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java b/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java index fb6fa844e..00c5a4c62 100644 --- a/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java +++ b/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java @@ -21,7 +21,6 @@ import java.io.IOException; public class JPEGTablesTag extends Tag { public JPEGTablesTag(byte[] data, long pos) throws IOException { - super(8, "JPEGTables",data, pos); //data is JPEG data + super(8, "JPEGTables", data, pos); //data is JPEG data } - } diff --git a/trunk/src/com/jpexs/asdec/tags/MetadataTag.java b/trunk/src/com/jpexs/asdec/tags/MetadataTag.java index 7898fcaa5..32d97316e 100644 --- a/trunk/src/com/jpexs/asdec/tags/MetadataTag.java +++ b/trunk/src/com/jpexs/asdec/tags/MetadataTag.java @@ -28,7 +28,7 @@ public class MetadataTag extends Tag { public String xmlMetadata; public MetadataTag(byte[] data, int version, long pos) { - super(77,"Metadata", data, pos); + super(77, "Metadata", data, pos); try { SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); xmlMetadata = sis.readString(); @@ -53,5 +53,4 @@ public class MetadataTag extends Tag { } return baos.toByteArray(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java index c786ab1ba..bc50c0538 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java @@ -158,7 +158,7 @@ public class PlaceObject2Tag extends Tag implements Container { } public PlaceObject2Tag(boolean placeFlagHasClipActions, boolean placeFlagHasClipDepth, boolean placeFlagHasName, boolean placeFlagHasRatio, boolean placeFlagHasColorTransform, boolean placeFlagHasMatrix, boolean placeFlagHasCharacter, boolean placeFlagMove, int depth, int characterId, MATRIX matrix, CXFORMWITHALPHA colorTransform, int ratio, String name, int clipDepth, CLIPACTIONS clipActions) { - super(26,"PlaceObject2", new byte[0], 0); + super(26, "PlaceObject2", new byte[0], 0); this.placeFlagHasClipActions = placeFlagHasClipActions; this.placeFlagHasClipDepth = placeFlagHasClipDepth; this.placeFlagHasName = placeFlagHasName; @@ -177,8 +177,6 @@ public class PlaceObject2Tag extends Tag implements Container { this.clipActions = clipActions; } - - /** * Constructor * @@ -187,7 +185,7 @@ public class PlaceObject2Tag extends Tag implements Container { * @throws IOException */ public PlaceObject2Tag(byte data[], int version, long pos) throws IOException { - super(26,"PlaceObject2", data, pos); + super(26, "PlaceObject2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); placeFlagHasClipActions = sis.readUB(1) == 1; placeFlagHasClipDepth = sis.readUB(1) == 1; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java index 5ca8f513c..3c4cf473d 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java @@ -228,7 +228,7 @@ public class PlaceObject3Tag extends Tag implements Container { * @throws IOException */ public PlaceObject3Tag(byte data[], int version, long pos) throws IOException { - super(70,"PlaceObject3", data, pos); + super(70, "PlaceObject3", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); placeFlagHasClipActions = sis.readUB(1) == 1; placeFlagHasClipDepth = sis.readUB(1) == 1; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java index 385708505..864299917 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java @@ -80,7 +80,7 @@ public class PlaceObjectTag extends Tag { * @throws IOException */ public PlaceObjectTag(byte data[], int version, long pos) throws IOException { - super(4,"PlaceObject", data, pos); + super(4, "PlaceObject", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterId = sis.readUI16(); depth = sis.readUI16(); @@ -91,13 +91,10 @@ public class PlaceObjectTag extends Tag { } public PlaceObjectTag(int characterId, int depth, MATRIX matrix, CXFORM colorTransform) { - super(4,"PlaceObject", new byte[0], 0); + super(4, "PlaceObject", new byte[0], 0); this.characterId = characterId; this.depth = depth; this.matrix = matrix; this.colorTransform = colorTransform; } - - - } diff --git a/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java b/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java index c92364b9c..9074609c6 100644 --- a/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java @@ -31,7 +31,7 @@ public class ProductInfoTag extends Tag { public long compilationDate; public ProductInfoTag(byte[] data, int version, long pos) throws IOException { - super(41, "ProductInfo",data, pos); + super(41, "ProductInfo", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); /* * 0: Unknown @@ -58,5 +58,4 @@ public class ProductInfoTag extends Tag { compilationDate = sis.readUI32() & 0xffffffffL; compilationDate |= sis.readUI32() << 32; } - } diff --git a/trunk/src/com/jpexs/asdec/tags/ProtectTag.java b/trunk/src/com/jpexs/asdec/tags/ProtectTag.java index 323576690..8825cc358 100644 --- a/trunk/src/com/jpexs/asdec/tags/ProtectTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ProtectTag.java @@ -63,7 +63,7 @@ public class ProtectTag extends Tag { * @throws IOException */ public ProtectTag(byte data[], int version, long pos) throws IOException { - super(24,"Protect", data, pos); + super(24, "Protect", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); if (sis.available() > 0) { passwordHash = sis.readString(); diff --git a/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java b/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java index 5f0adaacd..40c33191e 100644 --- a/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java @@ -25,7 +25,7 @@ public class RemoveObject2Tag extends Tag { public int depth; public RemoveObject2Tag(byte[] data, int version, long pos) throws IOException { - super(28,"RemoveObject2",data, pos); + super(28, "RemoveObject2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); depth = sis.readUI16(); } diff --git a/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java b/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java index b12e4f5f7..8705d9840 100644 --- a/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java +++ b/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java @@ -66,10 +66,9 @@ public class RemoveObjectTag extends Tag { * @throws IOException */ public RemoveObjectTag(byte data[], int version, long pos) throws IOException { - super(5,"RemoveObject", data, pos); + super(5, "RemoveObject", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); characterId = sis.readUI16(); depth = sis.readUI16(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java b/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java index 179c33fc6..5aad5f07d 100644 --- a/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java @@ -29,7 +29,7 @@ public class ScriptLimitsTag extends Tag { public int scriptTimeoutSeconds; public ScriptLimitsTag(byte[] data, int version, long pos) throws IOException { - super(65,"ScriptLimits", data, pos); + super(65, "ScriptLimits", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); maxRecursionDepth = sis.readUI16(); scriptTimeoutSeconds = sis.readUI16(); diff --git a/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java b/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java index 6875ba5b8..609fb9e37 100644 --- a/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java +++ b/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java @@ -22,20 +22,19 @@ import com.jpexs.asdec.types.RGB; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; public class SetBackgroundColorTag extends Tag { public RGB backgroundColor; public SetBackgroundColorTag(byte[] data, int version, long pos) throws IOException { - super(9,"SetBackgroundColor", data, pos); + super(9, "SetBackgroundColor", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); backgroundColor = sis.readRGB(); } public SetBackgroundColorTag(RGB backgroundColor) { - super(9,"SetBackgroundColor", new byte[0], 0); + super(9, "SetBackgroundColor", new byte[0], 0); this.backgroundColor = backgroundColor; } @@ -44,12 +43,9 @@ public class SetBackgroundColorTag extends Tag { ByteArrayOutputStream baos = new ByteArrayOutputStream(); SWFOutputStream sos = new SWFOutputStream(baos, version); try { - sos.writeRGB(backgroundColor); - } catch (IOException e) { - } + sos.writeRGB(backgroundColor); + } catch (IOException e) { + } return baos.toByteArray(); } - - - } diff --git a/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java b/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java index 3f9397253..187cea3dd 100644 --- a/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java +++ b/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java @@ -66,10 +66,9 @@ public class SetTabIndexTag extends Tag { * @throws IOException */ public SetTabIndexTag(byte data[], int version, long pos) throws IOException { - super(66,"SetTabIndex", data, pos); + super(66, "SetTabIndex", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); depth = sis.readUI16(); tabIndex = sis.readUI16(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java b/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java index eabe8e9fb..539bf04af 100644 --- a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java @@ -27,11 +27,11 @@ public class ShowFrameTag extends Tag { * Constructor */ public ShowFrameTag(long pos) { - super(1,"ShowFrame", new byte[0], pos); + super(1, "ShowFrame", new byte[0], pos); } - public ShowFrameTag(){ - super(1,"ShowFrame", new byte[0], 0); + public ShowFrameTag() { + super(1, "ShowFrame", new byte[0], 0); } /** @@ -44,5 +44,4 @@ public class ShowFrameTag extends Tag { public byte[] getData(int version) { return super.getData(version); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java b/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java index 4f3a2b04b..e9fb5d305 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java +++ b/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java @@ -33,6 +33,6 @@ public class SoundStreamBlockTag extends Tag { * @throws IOException */ public SoundStreamBlockTag(byte data[], int version, long pos) throws IOException { - super(19,"SoundStreamBlock", data, pos); //all data is streamSoundData + super(19, "SoundStreamBlock", data, pos); //all data is streamSoundData } } diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java b/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java index 7a4ef807f..aa2289d36 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java @@ -77,7 +77,7 @@ public class SoundStreamHead2Tag extends Tag { * @throws IOException */ public SoundStreamHead2Tag(byte data[], int version, long pos) throws IOException { - super(45,"SoundStreamHead2", data, pos); + super(45, "SoundStreamHead2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); sis.readUB(4);//reserved playBackSoundRate = (int) sis.readUB(2); diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java b/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java index 24d3847bf..109bec4ea 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java +++ b/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java @@ -77,7 +77,7 @@ public class SoundStreamHeadTag extends Tag { * @throws IOException */ public SoundStreamHeadTag(byte data[], int version, long pos) throws IOException { - super(18,"SoundStreamHead", data, pos); + super(18, "SoundStreamHead", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); sis.readUB(4);//reserved playBackSoundRate = (int) sis.readUB(2); diff --git a/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java b/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java index 4fe7791e2..5cabd66de 100644 --- a/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java @@ -60,10 +60,9 @@ public class StartSound2Tag extends Tag { * @throws IOException */ public StartSound2Tag(byte data[], int version, long pos) throws IOException { - super(89,"StartSound2", data, pos); + super(89, "StartSound2", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); soundClassName = sis.readString(); soundInfo = sis.readSOUNDINFO(); } - } diff --git a/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java b/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java index 76acd73bf..0e3b1e80f 100644 --- a/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java +++ b/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java @@ -61,7 +61,7 @@ public class StartSoundTag extends Tag { * @throws IOException */ public StartSoundTag(byte data[], int version, long pos) throws IOException { - super(15,"StartSound", data, pos); + super(15, "StartSound", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); soundId = sis.readUI16(); soundInfo = sis.readSOUNDINFO(); diff --git a/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java b/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java index 468572c44..1e116d8f6 100644 --- a/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java +++ b/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java @@ -29,7 +29,7 @@ public class SymbolClassTag extends Tag { public String classNames[]; public SymbolClassTag(byte[] data, int version, long pos) throws IOException { - super(76,"SymbolClass", data, pos); + super(76, "SymbolClass", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); int numSymbols = sis.readUI16(); tagIDs = new int[numSymbols]; diff --git a/trunk/src/com/jpexs/asdec/tags/Tag.java b/trunk/src/com/jpexs/asdec/tags/Tag.java index 5a263a1c8..1f81502c8 100644 --- a/trunk/src/com/jpexs/asdec/tags/Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/Tag.java @@ -37,18 +37,16 @@ public class Tag { */ public boolean forceWriteAsLong = false; private final long pos; - protected String name; public String getName() { return name; } - public String getExportName(){ + public String getExportName() { return getName(); } - - + /** * Returns identifier of tag type * diff --git a/trunk/src/com/jpexs/asdec/tags/TagStub.java b/trunk/src/com/jpexs/asdec/tags/TagStub.java index 43bab2541..429e642bf 100644 --- a/trunk/src/com/jpexs/asdec/tags/TagStub.java +++ b/trunk/src/com/jpexs/asdec/tags/TagStub.java @@ -56,7 +56,7 @@ public class TagStub extends Tag { * @throws IOException */ public TagStub(byte data[], int version, long pos) throws IOException { - super(0,"", data, pos); + super(0, "", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); } diff --git a/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java b/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java index 731def2a9..e61e01ad3 100644 --- a/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java +++ b/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java @@ -62,7 +62,7 @@ public class VideoFrameTag extends Tag { * @throws IOException */ public VideoFrameTag(byte data[], int version, long pos) throws IOException { - super(61,"VideoFrame", data, pos); + super(61, "VideoFrame", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); streamID = sis.readUI16(); frameNum = sis.readUI16(); diff --git a/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java b/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java index 6efd5ac53..2bf062b28 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java +++ b/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java @@ -7,5 +7,6 @@ import com.jpexs.asdec.types.RECT; * @author JPEXS */ public interface BoundedTag { + public RECT getRect(); } diff --git a/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java b/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java index 4558810cd..da28add45 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java +++ b/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java @@ -14,14 +14,13 @@ public abstract class CharacterTag extends Tag { public CharacterTag(int id, String name, byte[] data, long pos) { super(id, name, data, pos); } - - public abstract int getCharacterID(); - /** + public abstract int getCharacterID(); + /** * List of ExportAssetsTag used for converting to String */ public List exportAssetsTags = new ArrayList(); - + @Override public String getName() { String nameAppend = ""; @@ -31,16 +30,11 @@ public abstract class CharacterTag extends Tag { nameAppend = ": " + eat.names.get(pos); } } - return super.getName()+" (" + getCharacterID() + nameAppend + ")"; + return super.getName() + " (" + getCharacterID() + nameAppend + ")"; } @Override public String getExportName() { - return super.getName()+"_"+getCharacterID(); + return super.getName() + "_" + getCharacterID(); } - - - - - } diff --git a/trunk/src/com/jpexs/asdec/tags/base/FontTag.java b/trunk/src/com/jpexs/asdec/tags/base/FontTag.java index 169a0be09..57fa32b44 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/FontTag.java +++ b/trunk/src/com/jpexs/asdec/tags/base/FontTag.java @@ -5,5 +5,4 @@ package com.jpexs.asdec.tags.base; * @author JPEXS */ public interface FontTag { - } diff --git a/trunk/src/com/jpexs/asdec/types/MATRIX.java b/trunk/src/com/jpexs/asdec/types/MATRIX.java index 8224219a8..d2706529a 100644 --- a/trunk/src/com/jpexs/asdec/types/MATRIX.java +++ b/trunk/src/com/jpexs/asdec/types/MATRIX.java @@ -55,15 +55,13 @@ public class MATRIX { /** * Y translate value in twips */ - public int translateY; - + public int translateY; public int bitsTranslate; public int bitsRotate; public int bitsScale; + @Override public String toString() { - return "[MATRIX scale:"+scaleX+","+scaleY+", rotate:"+rotateSkew0+","+rotateSkew1+", translate:"+translateX+","+translateY+"]"; + return "[MATRIX scale:" + scaleX + "," + scaleY + ", rotate:" + rotateSkew0 + "," + rotateSkew1 + ", translate:" + translateX + "," + translateY + "]"; } - - } diff --git a/trunk/src/com/jpexs/asdec/types/PIX24.java b/trunk/src/com/jpexs/asdec/types/PIX24.java index 04035c109..e5aa22295 100644 --- a/trunk/src/com/jpexs/asdec/types/PIX24.java +++ b/trunk/src/com/jpexs/asdec/types/PIX24.java @@ -38,8 +38,6 @@ public class PIX24 { @Override public String toString() { - return "[PIX24 red:"+red+", green:"+green+", blue:"+blue+"]"; + return "[PIX24 red:" + red + ", green:" + green + ", blue:" + blue + "]"; } - - } diff --git a/trunk/src/com/jpexs/asdec/types/RECT.java b/trunk/src/com/jpexs/asdec/types/RECT.java index 3c8985c39..e4c49a82b 100644 --- a/trunk/src/com/jpexs/asdec/types/RECT.java +++ b/trunk/src/com/jpexs/asdec/types/RECT.java @@ -39,7 +39,6 @@ public class RECT { * Y maximum position for rectangle in twips */ public int Ymax; - public int nbits; public RECT(int Xmin, int Xmax, int Ymin, int Ymax) { @@ -48,22 +47,20 @@ public class RECT { this.Ymin = Ymin; this.Ymax = Ymax; } - - public RECT() - { - + + public RECT() { } @Override public String toString() { return "[RECT x=" + Xmin + "-" + Xmax + ", y=" + Ymin + "-" + Ymax + "]"; } - - public int getWidth(){ - return Xmax-Xmin; + + public int getWidth() { + return Xmax - Xmin; } - - public int getHeight(){ - return Ymax-Ymin; + + public int getHeight() { + return Ymax - Ymin; } } diff --git a/trunk/src/com/jpexs/asdec/types/RGB.java b/trunk/src/com/jpexs/asdec/types/RGB.java index 2912a93e5..50332d29c 100644 --- a/trunk/src/com/jpexs/asdec/types/RGB.java +++ b/trunk/src/com/jpexs/asdec/types/RGB.java @@ -41,8 +41,7 @@ public class RGB { this.green = green; this.blue = blue; } - - public RGB(){ - + + public RGB() { } }