diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index 9773ae0ce..f8b835ab4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -331,6 +331,7 @@ public final class SWF implements TreeItem { * @param listener * @param parallelRead Use parallel threads? * @throws IOException + * @throws java.lang.InterruptedException */ public SWF(InputStream is, ProgressListener listener, boolean parallelRead) throws IOException, InterruptedException { this(is, listener, parallelRead, false); @@ -344,6 +345,7 @@ public final class SWF implements TreeItem { * @param parallelRead Use parallel threads? * @param checkOnly Check only file validity * @throws IOException + * @throws java.lang.InterruptedException */ public SWF(InputStream is, ProgressListener listener, boolean parallelRead, boolean checkOnly) throws IOException, InterruptedException { byte[] hdr = new byte[3]; diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index 614546659..f83cb2464 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -377,6 +377,7 @@ public class SWFInputStream extends InputStream { * Sets position in bytes in the stream * * @param pos Number of bytes + * @throws java.io.IOException */ public void seek(long pos) throws IOException { if (is instanceof SeekableInputStream) { @@ -834,6 +835,7 @@ public class SWFInputStream extends InputStream { * @param parseTags * @return List of tags * @throws IOException + * @throws java.lang.InterruptedException */ public List readTagList(SWF swf, int level, boolean parallel, boolean skipUnusualTags, boolean parseTags) throws IOException, InterruptedException { ExecutorService executor = null; @@ -1232,6 +1234,7 @@ public class SWFInputStream extends InputStream { * @param skipUnusualTags * @return Tag or null when End tag * @throws IOException + * @throws java.lang.InterruptedException */ public Tag readTag(SWF swf, int level, long pos, boolean resolve, boolean parallel, boolean skipUnusualTags) throws IOException, InterruptedException { int tagIDTagLength = readUI16(); @@ -1297,6 +1300,7 @@ public class SWFInputStream extends InputStream { /** * Reads one Action from the stream * + * @param cpool * @return Action or null when ActionEndFlag or end of the stream * @throws IOException */ @@ -1656,6 +1660,7 @@ public class SWFInputStream extends InputStream { /** * Reads one CLIPACTIONRECORD value from the stream * + * @param swf * @return CLIPACTIONRECORD value * @throws IOException */ @@ -1671,6 +1676,7 @@ public class SWFInputStream extends InputStream { /** * Reads one CLIPACTIONS value from the stream * + * @param swf * @return CLIPACTIONS value * @throws IOException */ @@ -2021,6 +2027,7 @@ public class SWFInputStream extends InputStream { /** * Reads list of BUTTONCONDACTION values from the stream * + * @param swf * @return List of BUTTONCONDACTION values * @throws IOException */ @@ -2037,6 +2044,7 @@ public class SWFInputStream extends InputStream { /** * Reads one BUTTONCONDACTION value from the stream * + * @param swf * @return BUTTONCONDACTION value * @throws IOException */ diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java index 72af5aa8a..d934776a8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java @@ -2742,6 +2742,7 @@ public final class Flasm3Lexer { /** * Closes the input stream. + * @throws java.io.IOException */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ @@ -2776,6 +2777,7 @@ public final class Flasm3Lexer { /** * Returns the current lexical state. + * @return */ public final int yystate() { return zzLexicalState; @@ -2792,6 +2794,7 @@ public final class Flasm3Lexer { /** * Returns the text matched by the current regular expression. + * @return */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); @@ -2813,6 +2816,7 @@ public final class Flasm3Lexer { /** * Returns the length of the matched text region. + * @return */ public final int yylength() { return zzMarkedPos - zzStartRead; @@ -2864,6 +2868,7 @@ public final class Flasm3Lexer { * * @return the next token * @exception java.io.IOException if any I/O-Error occurs + * @throws com.jpexs.decompiler.flash.abc.avm2.parser.ParseException */ public ParsedSymbol yylex() throws java.io.IOException, ParseException { int zzInput; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java index 1481f6bb4..10a0199ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java @@ -628,6 +628,7 @@ public final class MethodInfoLexer { /** * Closes the input stream. + * @throws java.io.IOException */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ @@ -662,6 +663,7 @@ public final class MethodInfoLexer { /** * Returns the current lexical state. + * @return */ public final int yystate() { return zzLexicalState; @@ -678,6 +680,7 @@ public final class MethodInfoLexer { /** * Returns the text matched by the current regular expression. + * @return */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); @@ -699,6 +702,7 @@ public final class MethodInfoLexer { /** * Returns the length of the matched text region. + * @return */ public final int yylength() { return zzMarkedPos - zzStartRead; @@ -750,6 +754,7 @@ public final class MethodInfoLexer { * * @return the next token * @exception java.io.IOException if any I/O-Error occurs + * @throws com.jpexs.decompiler.flash.abc.methodinfo_parser.ParseException */ public ParsedSymbol yylex() throws java.io.IOException, ParseException { int zzInput; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index bc29ff0df..489380b05 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -402,6 +402,7 @@ public class Action implements GraphSourceItem { * @param importantOffsets List of important offsets to mark as labels * @param version SWF version * @param exportMode PCode or hex? + * @param writer * @param swfPos * @param path * @return HilightedTextWriter @@ -627,6 +628,7 @@ public class Action implements GraphSourceItem { * @param functions Functions * @param staticOperation the value of staticOperation * @param path the value of path + * @throws java.lang.InterruptedException */ public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) throws InterruptedException { } @@ -707,6 +709,7 @@ public class Action implements GraphSourceItem { * @param actions List of actions * @param version SWF version * @param path + * @throws java.lang.InterruptedException */ public static void actionsToSource(ASMSource asm, final List actions, final int version, final String path, GraphTextWriter writer) throws InterruptedException { writer.suspendMeasure(); @@ -756,6 +759,7 @@ public class Action implements GraphSourceItem { * @param staticOperation * @param path * @return List of treeItems + * @throws java.lang.InterruptedException */ public static List actionsToTree(HashMap regNames, HashMap variables, HashMap functions, List actions, int version, int staticOperation, String path) throws InterruptedException { //Stack stack = new Stack(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java index 0e9fdabef..063413bc3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java @@ -85,6 +85,7 @@ public class ActionListReader { * @param path * @return List of actions * @throws IOException + * @throws java.util.concurrent.TimeoutException */ public static List readActionListTimeout(final List listeners, final long containerSWFOffset, final MemoryInputStream mis, final int version, final int ip, final int endIp, final String path) throws IOException, InterruptedException, TimeoutException { try { @@ -121,6 +122,7 @@ public class ActionListReader { * @param path * @return List of actions * @throws IOException + * @throws java.lang.InterruptedException */ public static List readActionList(List listeners, long containerSWFOffset, MemoryInputStream mis, int version, int ip, int endIp, String path) throws IOException, InterruptedException { boolean deobfuscate = Configuration.autoDeobfuscate.get(); @@ -217,6 +219,7 @@ public class ActionListReader { * @param path * @return List of actions * @throws IOException + * @throws java.lang.InterruptedException */ public static List deobfuscateActionList(List listeners, long containerSWFOffset, List actions, int version, int ip, String path) throws IOException, InterruptedException { if (actions.isEmpty()) { @@ -525,6 +528,7 @@ public class ActionListReader { * * @param actions * @param index + * @return */ public static boolean removeAction(List actions, int index, int version, boolean removeWhenLast) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java index 0d3095a44..9c80e498b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java @@ -632,6 +632,7 @@ public final class FlasmLexer { /** * Closes the input stream. + * @throws java.io.IOException */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ @@ -666,6 +667,7 @@ public final class FlasmLexer { /** * Returns the current lexical state. + * @return */ public final int yystate() { return zzLexicalState; @@ -682,6 +684,7 @@ public final class FlasmLexer { /** * Returns the text matched by the current regular expression. + * @return */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); @@ -703,6 +706,7 @@ public final class FlasmLexer { /** * Returns the length of the matched text region. + * @return */ public final int yylength() { return zzMarkedPos - zzStartRead; @@ -754,6 +758,7 @@ public final class FlasmLexer { * * @return the next token * @exception java.io.IOException if any I/O-Error occurs + * @throws com.jpexs.decompiler.flash.action.parser.ParseException */ public ASMParsedSymbol yylex() throws java.io.IOException, ParseException { int zzInput; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java index b89b42090..7f1c67c9f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java @@ -1194,6 +1194,7 @@ public final class ActionScriptLexer { /** * Closes the input stream. + * @throws java.io.IOException */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ @@ -1228,6 +1229,7 @@ public final class ActionScriptLexer { /** * Returns the current lexical state. + * @return */ public final int yystate() { return zzLexicalState; @@ -1244,6 +1246,7 @@ public final class ActionScriptLexer { /** * Returns the text matched by the current regular expression. + * @return */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); @@ -1265,6 +1268,7 @@ public final class ActionScriptLexer { /** * Returns the length of the matched text region. + * @return */ public final int yylength() { return zzMarkedPos - zzStartRead; @@ -1316,6 +1320,7 @@ public final class ActionScriptLexer { * * @return the next token * @exception java.io.IOException if any I/O-Error occurs + * @throws com.jpexs.decompiler.flash.action.parser.ParseException */ public ParsedSymbol yylex() throws java.io.IOException, ParseException { int zzInput; diff --git a/trunk/src/com/jpexs/decompiler/flash/configuration/ConfigurationItem.java b/trunk/src/com/jpexs/decompiler/flash/configuration/ConfigurationItem.java index f9198b144..9a4d8faed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/configuration/ConfigurationItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/configuration/ConfigurationItem.java @@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.configuration; /** * * @author JPEXS + * @param */ public class ConfigurationItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/trunk/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java index d91cc8370..76dc79064 100644 --- a/trunk/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java @@ -123,6 +123,7 @@ public class CommandLineArgumentParser { * Parses the console arguments * * @return path to the file which should be opened or null + * @throws java.io.IOException */ public static String parseArguments(String[] arguments) throws IOException { Level traceLevel = Level.WARNING; diff --git a/trunk/src/com/jpexs/decompiler/flash/flv/AUDIODATA.java b/trunk/src/com/jpexs/decompiler/flash/flv/AUDIODATA.java index bff358fa8..37a696482 100644 --- a/trunk/src/com/jpexs/decompiler/flash/flv/AUDIODATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/flv/AUDIODATA.java @@ -62,8 +62,8 @@ public class AUDIODATA extends DATA { FLVOutputStream flv = new FLVOutputStream(baos); flv.writeUB(4, soundFormat); flv.writeUB(2, soundRate); - flv.writeUB(1, soundSize?1:0); - flv.writeUB(1, soundType?1:0); + flv.writeUB(1, soundSize ? 1 : 0); + flv.writeUB(1, soundType ? 1 : 0); flv.write(soundData); } catch (IOException ex) { //ignore diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java index 6d938827c..92c630a7e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java @@ -41,6 +41,7 @@ public class FontPanel extends javax.swing.JPanel { /** * Creates new form FontPanel + * @param mainPanel */ public FontPanel(MainPanel mainPanel) { this.mainPanel = mainPanel; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java index 4355debc0..392a2c8c3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java @@ -37,6 +37,7 @@ public class FontPreviewDialog extends AppDialog { /** * Creates new form FontPreviewDialog + * @param font */ public FontPreviewDialog(java.awt.Frame parent, boolean modal, Font font) { super(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java index 19b98d3a3..300bd5309 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java @@ -78,7 +78,7 @@ public class GenericTagPanel extends JPanel { tag = null; genericTagPropertiesEditPanel.removeAll(); } - + public void setEditMode(boolean edit) { if (edit) { remove(genericTagPropertiesEditorPaneScrollPanel); @@ -86,7 +86,7 @@ public class GenericTagPanel extends JPanel { } else { remove(genericTagPropertiesEditPanelScrollPanel); add(genericTagPropertiesEditorPaneScrollPanel); - } + } repaint(); } @@ -112,12 +112,12 @@ public class GenericTagPanel extends JPanel { int propCount = generateEditControlsRecursive(tag, ""); //Lay out the panel. SpringUtilities.makeCompactGrid(genericTagPropertiesEditPanel, - propCount, 2, //rows, cols - 6, 6, //initX, initY - 6, 6); //xPad, yPad + propCount, 2, //rows, cols + 6, 6, //initX, initY + 6, 6); //xPad, yPad repaint(); } - + private int generateEditControlsRecursive(Object obj, String parent) { Field[] fields = obj.getClass().getDeclaredFields(); int propCount = 0; @@ -148,7 +148,7 @@ public class GenericTagPanel extends JPanel { } return propCount; } - + private int addEditor(String name, Object obj, Field field) throws IllegalArgumentException, IllegalAccessException { Component editor; Class type = field.getType(); @@ -166,8 +166,8 @@ public class GenericTagPanel extends JPanel { editor = new BooleanEditor(obj, field); } else if (type.equals(String.class)) { editor = new StringEditor(obj, field); - } else if (type.equals(RECT.class) - || type.equals(RGB.class) + } else if (type.equals(RECT.class) + || type.equals(RGB.class) || type.equals(ZONERECORD.class) || type.equals(ZONEDATA.class)) { // todo: add other swf releated classes @@ -178,14 +178,14 @@ public class GenericTagPanel extends JPanel { textArea.setEditable(false); editor = textArea; } - + JLabel label = new JLabel(name + ":", JLabel.TRAILING); genericTagPropertiesEditPanel.add(label); label.setLabelFor(editor); genericTagPropertiesEditPanel.add(editor); return 1; } - + public void save() { for (Object component : genericTagPropertiesEditPanel.getComponents()) { if (component instanceof GenericTagEditor) { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java b/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java index 4d333c5df..a9fcef938 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java @@ -37,6 +37,7 @@ public class LinkLabel extends JLabel { /** * Creates a new LinkLabel with the given text. + * @param text */ public LinkLabel(String text) { super(text); @@ -48,6 +49,7 @@ public class LinkLabel extends JLabel { /** * Sets the text of the label. + * @param text */ @Override public void setText(String text) { @@ -57,6 +59,7 @@ public class LinkLabel extends JLabel { /** * Returns the text set by the user. + * @return */ public String getNormalText() { return text; @@ -64,6 +67,7 @@ public class LinkLabel extends JLabel { /** * Processes mouse events and responds to clicks. + * @param evt */ @Override protected void processMouseEvent(MouseEvent evt) { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java index c2424f13e..0cc41cba1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java @@ -148,7 +148,7 @@ public class LoadFromCacheFrame extends AppFrame implements ActionListener { progressBar.setVisible(false); openButton.setEnabled(false); saveButton.setEnabled(false); - + java.util.List images = new ArrayList<>(); images.add(View.loadImage("loadcache16")); images.add(View.loadImage("loadcache32")); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java index e4b1eb046..1a0d6e216 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java @@ -720,7 +720,7 @@ public class Main { autoCheckForUpdates(); offerAssociation(); } - + public static void showModeFrame() { View.execInEventDispatch(new Runnable() { @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index 809ac993c..e57a7f8d1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -87,7 +87,7 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { static final String ACTION_PARALLEL_SPEED_UP = "PARALLELSPEEDUP"; static final String ACTION_INTERNAL_VIEWER_SWITCH = "INTERNALVIEWERSWITCH"; static final String ACTION_SEARCH = "SEARCH"; - static final String ACTION_TIMELINE = "TIMELINE"; + static final String ACTION_TIMELINE = "TIMELINE"; static final String ACTION_AUTO_DEOBFUSCATE = "AUTODEOBFUSCATE"; static final String ACTION_EXIT = "EXIT"; @@ -323,10 +323,10 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { searchCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.search")), View.getResizableIcon("search32")); assignListener(searchCommandButton, ACTION_SEARCH); - + timeLineCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.timeline")), View.getResizableIcon("timeline32")); assignListener(timeLineCommandButton, ACTION_TIMELINE); - + gotoDocumentClassCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.gotodocumentclass")), View.getResizableIcon("gotomainclass32")); assignListener(gotoDocumentClassCommandButton, ACTION_GOTO_DOCUMENT_CLASS); @@ -340,7 +340,7 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { assignListener(loadCacheCommandButton, ACTION_LOAD_CACHE); toolsBand.addCommandButton(searchCommandButton, RibbonElementPriority.TOP); - toolsBand.addCommandButton(timeLineCommandButton, RibbonElementPriority.TOP); + toolsBand.addCommandButton(timeLineCommandButton, RibbonElementPriority.TOP); toolsBand.addCommandButton(gotoDocumentClassCommandButton, RibbonElementPriority.TOP); toolsBand.addCommandButton(proxyCommandButton, RibbonElementPriority.MEDIUM); toolsBand.addCommandButton(loadMemoryCommandButton, RibbonElementPriority.MEDIUM); @@ -527,7 +527,7 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { saveCommandButton.setEnabled(mainFrame.panel.getCurrentSwf() != null); } } - + private void clearModified(SWF swf) { for (Tag tag : swf.tags) { tag.setModified(false); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SearchListener.java b/trunk/src/com/jpexs/decompiler/flash/gui/SearchListener.java index a13538a0c..f023c0a96 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SearchListener.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SearchListener.java @@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui; /** * * @author JPEXS + * @param */ public interface SearchListener { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SearchPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/SearchPanel.java index a2df4a4dc..d620dcf93 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SearchPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SearchPanel.java @@ -33,6 +33,7 @@ import jsyntaxpane.actions.DocumentSearchData; /** * * @author JPEXS + * @param */ public class SearchPanel extends JPanel implements ActionListener { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java index 346c41c98..2108b6ef3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java @@ -113,7 +113,7 @@ public class TagTree extends JTree { } } } - + if (isModified) { font = font.deriveFont(Font.BOLD); } else { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/View.java b/trunk/src/com/jpexs/decompiler/flash/gui/View.java index 9b72b43f3..2c491b57c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/View.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/View.java @@ -350,4 +350,4 @@ public class View { public static SubstanceColorScheme getColorScheme() { return SubstanceColorSchemeUtilities.getActiveColorScheme(new JButton(), ComponentState.ENABLED); } -} \ No newline at end of file +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/BooleanEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/BooleanEditor.java index 5126f24a3..38021aee6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/BooleanEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/BooleanEditor.java @@ -28,7 +28,7 @@ public class BooleanEditor extends JCheckBox implements GenericTagEditor { private final Object obj; private final Field field; - + public BooleanEditor(Object obj, Field field) { setBackground(Color.white); this.obj = obj; @@ -39,7 +39,7 @@ public class BooleanEditor extends JCheckBox implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/DoubleEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/DoubleEditor.java index 374d4e55e..8d537ef57 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/DoubleEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/DoubleEditor.java @@ -28,7 +28,7 @@ public class DoubleEditor extends JTextArea implements GenericTagEditor { private final Object obj; private final Field field; - + public DoubleEditor(Object obj, Field field) { setBackground(Color.white); setSize(100, getSize().height); @@ -42,7 +42,7 @@ public class DoubleEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/FloatEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/FloatEditor.java index 5ba18e34f..15abd3b4b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/FloatEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/FloatEditor.java @@ -28,7 +28,7 @@ public class FloatEditor extends JTextArea implements GenericTagEditor { private final Object obj; private final Field field; - + public FloatEditor(Object obj, Field field) { setBackground(Color.white); setSize(100, getSize().height); @@ -42,7 +42,7 @@ public class FloatEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/IntegerEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/IntegerEditor.java index c33c330b5..2015d255d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/IntegerEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/IntegerEditor.java @@ -28,7 +28,7 @@ public class IntegerEditor extends JTextArea implements GenericTagEditor { private final Object obj; private final Field field; - + public IntegerEditor(Object obj, Field field) { setBackground(Color.white); setSize(100, getSize().height); @@ -42,7 +42,7 @@ public class IntegerEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/LongEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/LongEditor.java index be9217b0e..01eb6e3de 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/LongEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/LongEditor.java @@ -28,7 +28,7 @@ public class LongEditor extends JTextArea implements GenericTagEditor { private final Object obj; private final Field field; - + public LongEditor(Object obj, Field field) { setBackground(Color.white); setSize(100, getSize().height); @@ -42,7 +42,7 @@ public class LongEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/ShortEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/ShortEditor.java index b08922c9f..a5c2599f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/ShortEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/ShortEditor.java @@ -28,7 +28,7 @@ public class ShortEditor extends JTextArea implements GenericTagEditor { private final Object obj; private final Field field; - + public ShortEditor(Object obj, Field field) { setBackground(Color.white); setSize(100, getSize().height); @@ -42,7 +42,7 @@ public class ShortEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/StringEditor.java b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/StringEditor.java index b2135ff76..2a4041f26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/StringEditor.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/generictageditors/StringEditor.java @@ -28,7 +28,7 @@ public class StringEditor extends JTextArea implements GenericTagEditor { private final Object tag; private final Field field; - + public StringEditor(Object obj, Field field) { setBackground(Color.white); setLineWrap(true); @@ -40,7 +40,7 @@ public class StringEditor extends JTextArea implements GenericTagEditor { // ignore } } - + @Override public void save() { try { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/helpers/SpringUtilities.java b/trunk/src/com/jpexs/decompiler/flash/gui/helpers/SpringUtilities.java index 63cc8dce4..6189403db 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/helpers/SpringUtilities.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/helpers/SpringUtilities.java @@ -28,37 +28,37 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package com.jpexs.decompiler.flash.gui.helpers; - + import javax.swing.*; import javax.swing.SpringLayout; import java.awt.*; - + /** - * A 1.4 file that provides utility methods for - * creating form- or grid-style layouts with SpringLayout. - * These utilities are used by several programs, such as - * SpringBox and SpringCompactGrid. + * A 1.4 file that provides utility methods for creating form- or grid-style + * layouts with SpringLayout. These utilities are used by several programs, such + * as SpringBox and SpringCompactGrid. */ public class SpringUtilities { + /** - * A debugging utility that prints to stdout the component's - * minimum, preferred, and maximum sizes. + * A debugging utility that prints to stdout the component's minimum, + * preferred, and maximum sizes. + * @param c */ public static void printSizes(Component c) { System.out.println("minimumSize = " + c.getMinimumSize()); System.out.println("preferredSize = " + c.getPreferredSize()); System.out.println("maximumSize = " + c.getMaximumSize()); } - + /** - * Aligns the first rows * cols - * components of parent in - * a grid. Each component is as big as the maximum - * preferred width and height of the components. - * The parent is made just big enough to fit them all. + * Aligns the first rows * cols components of + * parent in a grid. Each component is as big as the maximum + * preferred width and height of the components. The parent is made just big + * enough to fit them all. * + * @param parent * @param rows number of rows * @param cols number of columns * @param initialX x location to start the grid at @@ -67,101 +67,101 @@ public class SpringUtilities { * @param yPad y padding between cells */ public static void makeGrid(Container parent, - int rows, int cols, - int initialX, int initialY, - int xPad, int yPad) { + int rows, int cols, + int initialX, int initialY, + int xPad, int yPad) { SpringLayout layout; try { - layout = (SpringLayout)parent.getLayout(); + layout = (SpringLayout) parent.getLayout(); } catch (ClassCastException exc) { System.err.println("The first argument to makeGrid must use SpringLayout."); return; } - + Spring xPadSpring = Spring.constant(xPad); Spring yPadSpring = Spring.constant(yPad); Spring initialXSpring = Spring.constant(initialX); Spring initialYSpring = Spring.constant(initialY); int max = rows * cols; - + //Calculate Springs that are the max of the width/height so that all //cells have the same size. Spring maxWidthSpring = layout.getConstraints(parent.getComponent(0)). - getWidth(); + getWidth(); Spring maxHeightSpring = layout.getConstraints(parent.getComponent(0)). - getHeight(); + getHeight(); for (int i = 1; i < max; i++) { SpringLayout.Constraints cons = layout.getConstraints( - parent.getComponent(i)); - + parent.getComponent(i)); + maxWidthSpring = Spring.max(maxWidthSpring, cons.getWidth()); maxHeightSpring = Spring.max(maxHeightSpring, cons.getHeight()); } - + //Apply the new width/height Spring. This forces all the //components to have the same size. for (int i = 0; i < max; i++) { SpringLayout.Constraints cons = layout.getConstraints( - parent.getComponent(i)); - + parent.getComponent(i)); + cons.setWidth(maxWidthSpring); cons.setHeight(maxHeightSpring); } - + //Then adjust the x/y constraints of all the cells so that they //are aligned in a grid. SpringLayout.Constraints lastCons = null; SpringLayout.Constraints lastRowCons = null; for (int i = 0; i < max; i++) { SpringLayout.Constraints cons = layout.getConstraints( - parent.getComponent(i)); + parent.getComponent(i)); if (i % cols == 0) { //start of new row lastRowCons = lastCons; cons.setX(initialXSpring); } else { //x position depends on previous component cons.setX(Spring.sum(lastCons.getConstraint(SpringLayout.EAST), - xPadSpring)); + xPadSpring)); } - + if (i / cols == 0) { //first row cons.setY(initialYSpring); } else { //y position depends on previous row cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), - yPadSpring)); + yPadSpring)); } lastCons = cons; } - + //Set the parent's size. SpringLayout.Constraints pCons = layout.getConstraints(parent); pCons.setConstraint(SpringLayout.SOUTH, - Spring.sum( - Spring.constant(yPad), - lastCons.getConstraint(SpringLayout.SOUTH))); + Spring.sum( + Spring.constant(yPad), + lastCons.getConstraint(SpringLayout.SOUTH))); pCons.setConstraint(SpringLayout.EAST, - Spring.sum( - Spring.constant(xPad), - lastCons.getConstraint(SpringLayout.EAST))); + Spring.sum( + Spring.constant(xPad), + lastCons.getConstraint(SpringLayout.EAST))); } - + /* Used by makeCompactGrid. */ private static SpringLayout.Constraints getConstraintsForCell( - int row, int col, - Container parent, - int cols) { + int row, int col, + Container parent, + int cols) { SpringLayout layout = (SpringLayout) parent.getLayout(); Component c = parent.getComponent(row * cols + col); return layout.getConstraints(c); } - + /** - * Aligns the first rows * cols - * components of parent in - * a grid. Each component in a column is as wide as the maximum - * preferred width of the components in that column; - * height is similarly determined for each row. - * The parent is made just big enough to fit them all. + * Aligns the first rows * cols components of + * parent in a grid. Each component in a column is as wide as + * the maximum preferred width of the components in that column; height is + * similarly determined for each row. The parent is made just big enough to + * fit them all. * + * @param parent * @param rows number of rows * @param cols number of columns * @param initialX x location to start the grid at @@ -170,56 +170,56 @@ public class SpringUtilities { * @param yPad y padding between cells */ public static void makeCompactGrid(Container parent, - int rows, int cols, - int initialX, int initialY, - int xPad, int yPad) { + int rows, int cols, + int initialX, int initialY, + int xPad, int yPad) { SpringLayout layout; try { - layout = (SpringLayout)parent.getLayout(); + layout = (SpringLayout) parent.getLayout(); } catch (ClassCastException exc) { System.err.println("The first argument to makeCompactGrid must use SpringLayout."); return; } - + //Align all cells in each column and make them the same width. Spring x = Spring.constant(initialX); for (int c = 0; c < cols; c++) { Spring width = Spring.constant(0); for (int r = 0; r < rows; r++) { width = Spring.max(width, - getConstraintsForCell(r, c, parent, cols). - getWidth()); + getConstraintsForCell(r, c, parent, cols). + getWidth()); } for (int r = 0; r < rows; r++) { - SpringLayout.Constraints constraints = - getConstraintsForCell(r, c, parent, cols); + SpringLayout.Constraints constraints + = getConstraintsForCell(r, c, parent, cols); constraints.setX(x); constraints.setWidth(width); } x = Spring.sum(x, Spring.sum(width, Spring.constant(xPad))); } - + //Align all cells in each row and make them the same height. Spring y = Spring.constant(initialY); for (int r = 0; r < rows; r++) { Spring height = Spring.constant(0); for (int c = 0; c < cols; c++) { height = Spring.max(height, - getConstraintsForCell(r, c, parent, cols). - getHeight()); + getConstraintsForCell(r, c, parent, cols). + getHeight()); } for (int c = 0; c < cols; c++) { - SpringLayout.Constraints constraints = - getConstraintsForCell(r, c, parent, cols); + SpringLayout.Constraints constraints + = getConstraintsForCell(r, c, parent, cols); constraints.setY(y); constraints.setHeight(height); } y = Spring.sum(y, Spring.sum(height, Spring.constant(yPad))); } - + //Set the parent's size. SpringLayout.Constraints pCons = layout.getConstraints(parent); pCons.setConstraint(SpringLayout.SOUTH, y); pCons.setConstraint(SpringLayout.EAST, x); } -} \ No newline at end of file +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java index aba6ada3d..c4c2cbbbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java @@ -40,8 +40,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.logging.Level; -import java.util.logging.Logger; /** * @@ -226,7 +224,7 @@ public class FlashPlayerPanel extends Panel implements FlashDisplay { hwndFrame.setPointer(Native.getComponentPointer(frame)); startFlashPlayer(); - + executed = true; } } @@ -262,7 +260,7 @@ public class FlashPlayerPanel extends Panel implements FlashDisplay { Kernel32.INSTANCE.ConnectNamedPipe(pipe, null); } - + public synchronized void stopSWF() { displaySWF("-", null, 1); stopped = true; @@ -303,11 +301,11 @@ public class FlashPlayerPanel extends Panel implements FlashDisplay { public static void unload() { /*if (Platform.isWindows()) { - for (int i = 0; i < processes.size(); i++) { - Kernel32.INSTANCE.CloseHandle(pipes.get(i)); - Kernel32.INSTANCE.TerminateProcess(processes.get(i), 0); - } - }*/ + for (int i = 0; i < processes.size(); i++) { + Kernel32.INSTANCE.CloseHandle(pipes.get(i)); + Kernel32.INSTANCE.TerminateProcess(processes.get(i), 0); + } + }*/ } @Override @@ -413,7 +411,7 @@ public class FlashPlayerPanel extends Panel implements FlashDisplay { public boolean isLoaded() { return !isStopped(); } - + private synchronized boolean writeToPipe(final byte[] data) { final IntByReference ibr = new IntByReference(); int result = -1; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java index 29f2072d1..8483fba69 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java @@ -99,6 +99,7 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe /** * Constructor + * @param mainFrame */ public ProxyFrame(final MainFrame mainFrame) { diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java b/trunk/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java index 9ea9717e1..6006d164e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java @@ -41,6 +41,7 @@ public class GraphTextWriter { /** * Highlights specified text as instruction * + * @param src * @param pos Offset of instruction * @return GraphTextWriter */ diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java b/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java index bab17f70c..e6e958b84 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java @@ -65,6 +65,7 @@ public class HilightedTextWriter extends GraphTextWriter { /** * Highlights specified text as instruction by adding special tags * + * @param src * @param pos Offset of instruction * @return HilightedTextWriter */ diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/hilight/Highlighting.java b/trunk/src/com/jpexs/decompiler/flash/helpers/hilight/Highlighting.java index e619d709f..780d9146f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/hilight/Highlighting.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/hilight/Highlighting.java @@ -128,6 +128,7 @@ public class Highlighting implements Serializable { * @param startPos Starting position * @param data Highlighting data * @param type Highlighting type + * @param text */ public Highlighting(int startPos, Map data, HilightType type, String text) { this.startPos = startPos; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java index 3c3e25750..40b4fc628 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java @@ -35,19 +35,19 @@ public class CSMTextSettingsTag extends Tag { @SWFType(BasicType.UI16) public int textID; - - @SWFType(value=BasicType.UB,count=2) + + @SWFType(value = BasicType.UB, count = 2) public int useFlashType; - - @SWFType(value=BasicType.UB,count=3) + + @SWFType(value = BasicType.UB, count = 3) public int gridFit; - - @SWFType(value=BasicType.FLOAT) //F32 = FLOAT + + @SWFType(value = BasicType.FLOAT) //F32 = FLOAT public float thickness; - - @SWFType(value=BasicType.FLOAT) //F32 = FLOAT + + @SWFType(value = BasicType.FLOAT) //F32 = FLOAT public float sharpness; - + public static final int ID = 74; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java index 2e2bad942..79889f99d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java @@ -33,9 +33,9 @@ import java.io.OutputStream; */ public class DebugIDTag extends Tag { - @SWFType(value=BasicType.UI8,count=16) + @SWFType(value = BasicType.UI8, count = 16) public byte[] debugId; - + public static final int ID = 63; /** @@ -62,6 +62,7 @@ public class DebugIDTag extends Tag { * @param swf * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DebugIDTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java index cad58e3c5..256c7f231 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java @@ -32,13 +32,13 @@ public class DefineBinaryDataTag extends CharacterTag { @SWFType(BasicType.UI16) public int tag; - + public byte[] binaryData; - + @Reserved @SWFType(BasicType.UI32) public long reserved; - + public static final int ID = 87; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java index 98ad7fb95..b4bc0828a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java @@ -36,10 +36,10 @@ public class DefineBitsJPEG2Tag extends ImageTag implements AloneTag { @SWFType(BasicType.UI16) public int characterID; - + @SWFType(BasicType.UI8) public byte[] imageData; - + public static final int ID = 21; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java index 8f8eec44d..fca821346 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java @@ -36,13 +36,13 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag { @SWFType(BasicType.UI16) public int characterID; - + @SWFType(BasicType.UI8) public byte[] imageData; - + @SWFType(BasicType.UI8) public byte[] bitmapAlphaData; - + public static final int ID = 35; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java index a57e1bff0..f3877c8f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java @@ -42,16 +42,16 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag { @SWFType(BasicType.UI16) public int characterID; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) public int deblockParam; - - @SWFType(BasicType.UI8) + + @SWFType(BasicType.UI8) public byte[] imageData; - - @SWFType(BasicType.UI8) + + @SWFType(BasicType.UI8) public byte[] bitmapAlphaData; - + public static final int ID = 90; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 3c7b7cb52..3752ccb48 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -40,27 +40,27 @@ import javax.imageio.ImageIO; public class DefineBitsLossless2Tag extends ImageTag implements AloneTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int characterID; - - @SWFType(BasicType.UI8) + + @SWFType(BasicType.UI8) public int bitmapFormat; - + @SWFType(BasicType.UI16) public int bitmapWidth; - + @SWFType(BasicType.UI16) public int bitmapHeight; - + @SWFType(BasicType.UI8) - @Conditional(value="bitmapFormat",options={FORMAT_8BIT_COLORMAPPED}) + @Conditional(value = "bitmapFormat", options = {FORMAT_8BIT_COLORMAPPED}) public int bitmapColorTableSize; - + public byte[] zlibBitmapData; //TODO: Parse ALPHACOLORMAPDATA,ALPHABITMAPDATA - + public static final int FORMAT_8BIT_COLORMAPPED = 3; public static final int FORMAT_32BIT_ARGB = 5; - + public static final int ID = 36; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java index 0f395ea7a..7ce83be8c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import static com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag.FORMAT_8BIT_COLORMAPPED; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.types.BITMAPDATA; @@ -43,35 +42,34 @@ import javax.imageio.ImageIO; public class DefineBitsLosslessTag extends ImageTag implements AloneTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int characterID; - - @SWFType(BasicType.UI8) - public int bitmapFormat; - - - @SWFType(BasicType.UI16) - public int bitmapWidth; - - @SWFType(BasicType.UI16) - public int bitmapHeight; - + @SWFType(BasicType.UI8) - @Conditional(value="bitmapFormat",options={FORMAT_8BIT_COLORMAPPED}) + public int bitmapFormat; + + @SWFType(BasicType.UI16) + public int bitmapWidth; + + @SWFType(BasicType.UI16) + public int bitmapHeight; + + @SWFType(BasicType.UI8) + @Conditional(value = "bitmapFormat", options = {FORMAT_8BIT_COLORMAPPED}) public int bitmapColorTableSize; - + public byte[] zlibBitmapData; //TODO: Parse COLORMAPDATA,BITMAPDATA public static final int FORMAT_8BIT_COLORMAPPED = 3; public static final int FORMAT_15BIT_RGB = 4; public static final int FORMAT_24BIT_RGB = 5; - + @Internal private COLORMAPDATA colorMapData; @Internal private BITMAPDATA bitmapData; @Internal private boolean decompressed = false; - + public static final int ID = 20; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java index 18c24f6d6..53698abdd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java @@ -34,12 +34,12 @@ import javax.imageio.ImageIO; public class DefineBitsTag extends ImageTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int characterID; - + @SWFType(BasicType.UI8) public byte[] jpegData; - + @Internal private JPEGTablesTag jtt = null; public static final int ID = 6; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java index c819912c5..5dbb645b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java @@ -62,9 +62,9 @@ public class DefineButton2Tag extends CharacterTag implements Container, Bounded /** * ID for this character */ - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int buttonId; - + /** * Track as menu button */ @@ -92,6 +92,7 @@ public class DefineButton2Tag extends CharacterTag implements Container, Bounded /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java index 005816863..be7027151 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java @@ -34,7 +34,7 @@ import java.io.OutputStream; */ public class DefineButtonCxformTag extends Tag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int buttonId; public CXFORM buttonColorTransform; public static final int ID = 23; @@ -63,6 +63,7 @@ public class DefineButtonCxformTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineButtonCxformTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java index c85b7f38b..b32e7d3d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java @@ -35,27 +35,27 @@ import java.io.OutputStream; */ public class DefineButtonSoundTag extends CharacterTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int buttonId; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) public int buttonSoundChar0; - + public SOUNDINFO buttonSoundInfo0; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) public int buttonSoundChar1; - + public SOUNDINFO buttonSoundInfo1; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) public int buttonSoundChar2; - + public SOUNDINFO buttonSoundInfo2; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) public int buttonSoundChar3; - + public SOUNDINFO buttonSoundInfo3; public static final int ID = 17; @@ -103,6 +103,7 @@ public class DefineButtonSoundTag extends CharacterTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineButtonSoundTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java index f5c5f31d4..260ff410f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java @@ -67,7 +67,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT /** * ID for this character */ - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int buttonId; /** * Characters that make up the button @@ -95,6 +95,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos @@ -143,6 +144,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT * * @param version SWF version * @return ASM source + * @throws java.lang.InterruptedException */ @Override public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException { @@ -167,6 +169,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT * * @param version Version * @return List of actions + * @throws java.lang.InterruptedException */ @Override public List getActions(int version) throws InterruptedException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java index 317136771..b5c8eebea 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java @@ -55,9 +55,9 @@ import java.util.regex.Pattern; */ public class DefineEditTextTag extends TextTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int characterID; - + public RECT bounds; public boolean hasText; public boolean wordWrap; @@ -75,50 +75,50 @@ public class DefineEditTextTag extends TextTag { public boolean wasStatic; public boolean html; public boolean useOutlines; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) @Conditional("hasFont") public int fontId; - + @Conditional("hasFontClass") public String fontClass; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) @Conditional("hasFont") public int fontHeight; - + @Conditional("hasTextColor") public RGBA textColor; - - @SWFType(BasicType.UI16) + + @SWFType(BasicType.UI16) @Conditional("hasMaxLength") public int maxLength; - + @SWFType(BasicType.UI8) @Conditional("hasLayout") public int align; - + @SWFType(BasicType.UI16) @Conditional("hasLayout") public int leftMargin; - + @SWFType(BasicType.UI16) - @Conditional("hasLayout") + @Conditional("hasLayout") public int rightMargin; - + @SWFType(BasicType.UI16) - @Conditional("hasLayout") + @Conditional("hasLayout") public int indent; - + @SWFType(BasicType.SI16) - @Conditional("hasLayout") + @Conditional("hasLayout") public int leading; - + public String variableName; - + @Conditional("hasText") public String initialText; - + public static final int ID = 37; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java index 8d13666d1..9ba69a699 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java @@ -26,7 +26,6 @@ import com.jpexs.decompiler.flash.types.LANGCODE; import com.jpexs.decompiler.flash.types.RECT; import com.jpexs.decompiler.flash.types.SHAPE; import com.jpexs.decompiler.flash.types.annotations.Conditional; -import com.jpexs.decompiler.flash.types.annotations.ConditionalType; import com.jpexs.decompiler.flash.types.annotations.Internal; import com.jpexs.decompiler.flash.types.annotations.SWFType; import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; @@ -46,9 +45,9 @@ import javax.swing.JPanel; */ public class DefineFont2Tag extends FontTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int fontId; - + public boolean fontFlagsHasLayout; public boolean fontFlagsShiftJIS; public boolean fontFlagsSmallText; @@ -62,29 +61,29 @@ public class DefineFont2Tag extends FontTag { @Internal public int numGlyphs; public List glyphShapeTable; - - @SWFType(value=BasicType.UI16,alternateValue = BasicType.UI32,alternateCondition = "fontFlagsWideCodes") + + @SWFType(value = BasicType.UI16, alternateValue = BasicType.UI32, alternateCondition = "fontFlagsWideCodes") public List codeTable; - + @SWFType(BasicType.UI16) @Conditional("fontFlagsHasLayout") public int fontAscent; - + @SWFType(BasicType.UI16) @Conditional("fontFlagsHasLayout") public int fontDescent; - + @SWFType(BasicType.SI16) @Conditional("fontFlagsHasLayout") public int fontLeading; - + @SWFType(BasicType.SI16) @Conditional("fontFlagsHasLayout") public List fontAdvanceTable; - + @Conditional("fontFlagsHasLayout") public List fontBoundsTable; - + public KERNINGRECORD[] fontKerningTable; public static final int ID = 48; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java index 8b5dc4a56..6d6e643f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java @@ -43,9 +43,9 @@ import javax.swing.JPanel; public class DefineFont3Tag extends FontTag { - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int fontId; - + public boolean fontFlagsHasLayout; public boolean fontFlagsShiftJIS; public boolean fontFlagsSmallText; @@ -58,24 +58,24 @@ public class DefineFont3Tag extends FontTag { public String fontName; @Internal public int numGlyphs; - + public List glyphShapeTable; - - @SWFType(value=BasicType.UI16,alternateValue = BasicType.UI32,alternateCondition = "fontFlagsWideCodes") + + @SWFType(value = BasicType.UI16, alternateValue = BasicType.UI32, alternateCondition = "fontFlagsWideCodes") public List codeTable; - + @SWFType(BasicType.UI16) @Conditional("fontFlagsHasLayout") public int fontAscent; - + @SWFType(BasicType.UI16) @Conditional("fontFlagsHasLayout") public int fontDescent; - + @SWFType(BasicType.SI16) @Conditional("fontFlagsHasLayout") public int fontLeading; - + public List fontAdvanceTable; public List fontBoundsTable; public KERNINGRECORD[] fontKerningTable; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java index a9ff1a37c..c3128c437 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java @@ -31,7 +31,7 @@ public class DefineFont4Tag extends CharacterTag { @SWFType(BasicType.UI16) public int fontID; - + public boolean fontFlagsHasFontData; public boolean fontFlagsItalic; public boolean fontFlagsBold; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java index c79b2ab33..b7b390c74 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java @@ -33,7 +33,7 @@ public class DefineFontAlignZonesTag extends Tag { @SWFType(BasicType.UI16) public int fontID; - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int CSMTableHint; public List zoneTable; public static final int ID = 73; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java index 10ba87a7a..5305f31cb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java @@ -88,6 +88,7 @@ public class DefineFontInfo2Tag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineFontInfo2Tag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java index 19996fbd7..0b217f0ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java @@ -45,7 +45,7 @@ public class DefineFontInfoTag extends Tag { public boolean fontFlagsItalic; public boolean fontFlagsBold; public boolean fontFlagsWideCodes; - @SWFType(value=BasicType.UI8,alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") + @SWFType(value = BasicType.UI8, alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") public List codeTable; public static final int ID = 13; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java index 7588c28ab..0d90fffee 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java @@ -134,6 +134,7 @@ public class DefineMorphShape2Tag extends CharacterTag implements BoundedTag, Mo /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java index 47a12a5a7..19b9233a2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java @@ -116,6 +116,7 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag, Mor /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java index 6f3d52d85..a04d48eb3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java @@ -35,12 +35,12 @@ public class DefineSceneAndFrameLabelDataTag extends Tag { @SWFType(BasicType.EncodedU32) public long[] sceneOffsets; - + public String[] sceneNames; - + @SWFType(BasicType.EncodedU32) public long[] frameNums; - + public String[] frameNames; public static final int ID = 86; @@ -78,6 +78,7 @@ public class DefineSceneAndFrameLabelDataTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineSceneAndFrameLabelDataTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java index d1a91ed58..0295e4d6a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java @@ -36,8 +36,8 @@ public class DefineSoundTag extends CharacterTag { @SWFType(BasicType.UI16) public int soundId; - - @SWFType(value=BasicType.UB,count=4) + + @SWFType(value = BasicType.UB, count = 4) public int soundFormat; public static final int FORMAT_UNCOMPRESSED_NATIVE_ENDIAN = 0; public static final int FORMAT_ADPCM = 1; @@ -47,16 +47,16 @@ public class DefineSoundTag extends CharacterTag { public static final int FORMAT_NELLYMOSER8KHZ = 5; public static final int FORMAT_NELLYMOSER = 6; public static final int FORMAT_SPEEX = 11; - - @SWFType(value=BasicType.UB,count=2) + + @SWFType(value = BasicType.UB, count = 2) public int soundRate; - + public boolean soundSize; public boolean soundType; - + @SWFType(BasicType.UI32) public long soundSampleCount; - + public byte[] soundData; public static final int ID = 14; @@ -80,8 +80,8 @@ public class DefineSoundTag extends CharacterTag { sos.writeUI16(soundId); sos.writeUB(4, soundFormat); sos.writeUB(2, soundRate); - sos.writeUB(1, soundSize?1:0); - sos.writeUB(1, soundType?1:0); + sos.writeUB(1, soundSize ? 1 : 0); + sos.writeUB(1, soundType ? 1 : 0); sos.writeUI32(soundSampleCount); sos.write(soundData); } catch (IOException e) { @@ -94,6 +94,7 @@ public class DefineSoundTag extends CharacterTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineSoundTag(SWF swf, byte[] data, int version, long pos) throws IOException { @@ -102,8 +103,8 @@ public class DefineSoundTag extends CharacterTag { soundId = sis.readUI16(); soundFormat = (int) sis.readUB(4); soundRate = (int) sis.readUB(2); - soundSize = sis.readUB(1)==1; - soundType = sis.readUB(1)==1; + soundSize = sis.readUB(1) == 1; + soundType = sis.readUB(1) == 1; soundSampleCount = sis.readUI32(); soundData = sis.readBytesEx(sis.available()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java index 63f5505e5..269e4a2a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java @@ -32,7 +32,6 @@ import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag; import com.jpexs.decompiler.flash.types.BasicType; import com.jpexs.decompiler.flash.types.MATRIX; import com.jpexs.decompiler.flash.types.RECT; -import com.jpexs.decompiler.flash.types.annotations.Internal; import com.jpexs.decompiler.flash.types.annotations.SWFType; import com.jpexs.helpers.Cache; import com.jpexs.helpers.SerializableImage; @@ -67,7 +66,7 @@ public class DefineSpriteTag extends CharacterTag implements Container, BoundedT * A series of tags */ public List subTags; - + public static final int ID = 39; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java index a8327b03f..88da7d3a0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java @@ -40,24 +40,24 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag { @SWFType(BasicType.UI16) public int characterID; - + @SWFType(BasicType.UI16) public int numFrames; - + @SWFType(BasicType.UI16) public int width; - + @SWFType(BasicType.UI16) public int height; - - @SWFType(value=BasicType.UB,count=3) + + @SWFType(value = BasicType.UB, count = 3) public int videoFlagsDeblocking; - + public boolean videoFlagsSmoothing; - + @SWFType(BasicType.UI8) public int codecID; - + public static final int CODEC_SORENSON_H263 = 2; public static final int CODEC_SCREEN_VIDEO = 3; public static final int CODEC_VP6 = 4; @@ -99,6 +99,7 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public DefineVideoStreamTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java index 83d1ca0a9..32152df9c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java @@ -51,7 +51,7 @@ public class DoABCDefineTag extends Tag implements ABCContainerTag { * executed immediately, but only parsed. A later finddef may cause its * scripts to execute. */ - @SWFType(BasicType.UI32) + @SWFType(BasicType.UI32) public long flags; /** * The name assigned to the bytecode. diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java index 8ff2e3bd0..cea05a679 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java @@ -76,6 +76,7 @@ public class DoActionTag extends Tag implements ASMSource { * * @param version SWF version * @return ASM source + * @throws java.lang.InterruptedException */ @Override public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java index da794d581..51eda88ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java @@ -106,6 +106,7 @@ public class DoInitActionTag extends CharacterIdTag implements ASMSource { * * @param version SWF version * @return ASM source + * @throws java.lang.InterruptedException */ @Override public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java index dabaf224e..5d764eea2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java @@ -35,7 +35,7 @@ import java.io.OutputStream; public class EnableDebugger2Tag extends Tag { @Reserved - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int reserved; /** * MD5 hash of password @@ -68,6 +68,7 @@ public class EnableDebugger2Tag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public EnableDebugger2Tag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java index 9427f5196..807ea43bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java @@ -62,6 +62,7 @@ public class EnableDebuggerTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public EnableDebuggerTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/EnableTelemetryTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableTelemetryTag.java index 0a4a7698a..81f076fa9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/EnableTelemetryTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableTelemetryTag.java @@ -36,13 +36,13 @@ import java.io.OutputStream; public class EnableTelemetryTag extends Tag { public static final int ID = 93; - - @SWFType(value=BasicType.UB,count=16) + + @SWFType(value = BasicType.UB, count = 16) @Reserved public int reserved; - + @Optional - @SWFType(value=BasicType.UI8,count=32) + @SWFType(value = BasicType.UI8, count = 32) public byte[] passwordHash; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java index 632935f8e..67590cf19 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java @@ -38,7 +38,7 @@ public class ExportAssetsTag extends Tag { /** * HashMap with assets */ - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public List tags; public List names; public static final int ID = 56; @@ -54,6 +54,7 @@ public class ExportAssetsTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public ExportAssetsTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java index 98e094af3..ce75e1bdb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java @@ -36,8 +36,8 @@ public class FileAttributesTag extends Tag { public boolean noCrossDomainCache; private boolean reserved1; private boolean reserved2; - - @SWFType(value=BasicType.UB,count=24) + + @SWFType(value = BasicType.UB, count = 24) private int reserved3; public static final int ID = 69; @@ -48,14 +48,14 @@ public class FileAttributesTag extends Tag { public FileAttributesTag(SWF swf, byte[] data, int version, long pos) throws IOException { super(swf, ID, "FileAttributes", data, pos); SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); - reserved1 = sis.readUB(1)==1; // reserved + reserved1 = sis.readUB(1) == 1; // reserved // UB[1] == 0 (reserved) useDirectBlit = sis.readUB(1) != 0; useGPU = sis.readUB(1) != 0; hasMetadata = sis.readUB(1) != 0; actionScript3 = sis.readUB(1) != 0; noCrossDomainCache = sis.readUB(1) != 0; - reserved2 = sis.readUB(1)==1; // reserved + reserved2 = sis.readUB(1) == 1; // reserved useNetwork = sis.readUB(1) != 0; // UB[24] == 0 (reserved) reserved3 = (int) sis.readUB(24); //reserved @@ -73,13 +73,13 @@ public class FileAttributesTag extends Tag { OutputStream os = baos; SWFOutputStream sos = new SWFOutputStream(os, version); try { - sos.writeUB(1, reserved1?1:0); //reserved + sos.writeUB(1, reserved1 ? 1 : 0); //reserved sos.writeUB(1, useDirectBlit ? 1 : 0); sos.writeUB(1, useGPU ? 1 : 0); sos.writeUB(1, hasMetadata ? 1 : 0); sos.writeUB(1, actionScript3 ? 1 : 0); sos.writeUB(1, noCrossDomainCache ? 1 : 0); - sos.writeUB(1, reserved2?1:0); //reserved + sos.writeUB(1, reserved2 ? 1 : 0); //reserved sos.writeUB(1, useNetwork ? 1 : 0); sos.writeUB(24, reserved3); //reserved } catch (IOException e) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java index b0e892e77..73b77b47a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java @@ -45,6 +45,7 @@ public class ImportAssets2Tag extends Tag implements ImportTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public ImportAssets2Tag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java index d87646b87..51bd29a24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java @@ -45,6 +45,7 @@ public class ImportAssetsTag extends Tag implements ImportTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public ImportAssetsTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java index 935513e0a..aca9efec3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java @@ -122,7 +122,7 @@ public class PlaceObject2Tag extends CharacterIdTag implements Container, PlaceO /** * @since SWF 5 If PlaceFlagHasClipActions, Clip Actions Data */ - @Conditional("placeFlagHasClipActions") + @Conditional("placeFlagHasClipActions") public CLIPACTIONS clipActions; public static final int ID = 26; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java index 31b8a6ef4..cd3442c24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java @@ -168,19 +168,19 @@ public class PlaceObject3Tag extends CharacterIdTag implements Container, PlaceO * If PlaceFlagHasBlendMode, Blend mode */ @SWFType(BasicType.UI8) - @Conditional("placeFlagHasBlendMode") + @Conditional("placeFlagHasBlendMode") public int blendMode; /** * If PlaceFlagHasCacheAsBitmap, 0 = Bitmap cache disabled, 1-255 = Bitmap * cache enabled */ @SWFType(BasicType.UI8) - @Conditional("placeFlagHasCacheAsBitmap") + @Conditional("placeFlagHasCacheAsBitmap") public int bitmapCache; /** * @since SWF 5 If PlaceFlagHasClipActions, Clip Actions Data */ - @Conditional(value="placeFlagHasClipActions",minSwfVersion = 5) + @Conditional(value = "placeFlagHasClipActions", minSwfVersion = 5) public CLIPACTIONS clipActions; /** * If PlaceFlagHasVisible, 0 = Place invisible, 1 = Place visible @@ -242,7 +242,7 @@ public class PlaceObject3Tag extends CharacterIdTag implements Container, PlaceO sos.writeUB(1, placeFlagHasMatrix ? 1 : 0); sos.writeUB(1, placeFlagHasCharacter ? 1 : 0); sos.writeUB(1, placeFlagMove ? 1 : 0); - sos.writeUB(1, reserved ?1:0); + sos.writeUB(1, reserved ? 1 : 0); sos.writeUB(1, placeFlagOpaqueBackground ? 1 : 0); //SWF11 sos.writeUB(1, placeFlagHasVisible ? 1 : 0); //SWF11 sos.writeUB(1, placeFlagHasImage ? 1 : 0); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java index 44adf8ff1..7d9ce044c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java @@ -28,7 +28,7 @@ import java.io.OutputStream; public class ProductInfoTag extends Tag { - @SWFType(BasicType.UI32) + @SWFType(BasicType.UI32) public long productID; @SWFType(BasicType.UI32) public long edition; @@ -93,6 +93,5 @@ public class ProductInfoTag extends Tag { } return baos.toByteArray(); } - - + } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java index 6f3dafb2d..2dfd6c075 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java @@ -62,6 +62,7 @@ public class ProtectTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public ProtectTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java index fc07f8c17..8b987e842 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java @@ -71,6 +71,7 @@ public class RemoveObjectTag extends CharacterIdTag implements RemoveTag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public RemoveObjectTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java index df4287b5a..450b2defd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java @@ -30,10 +30,10 @@ public class ScriptLimitsTag extends Tag { @SWFType(BasicType.UI16) public int maxRecursionDepth; - + @SWFType(BasicType.UI16) public int scriptTimeoutSeconds; - + public static final int ID = 65; public ScriptLimitsTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java index e30c2bb50..20bdf4b8f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java @@ -67,6 +67,7 @@ public class SetTabIndexTag extends Tag { /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java index c83e2a35c..325381185 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java @@ -72,7 +72,7 @@ public class ShowFrameTag extends Tag { public byte[] getData(int version) { return super.getData(version); } - + public static boolean isNestedTagType(int tagTypeId) { return nestedTagTypeIds.contains(tagTypeId); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java index d1ae063b2..c26e1fb6f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java @@ -37,28 +37,28 @@ import java.io.OutputStream; */ public class SoundStreamHead2Tag extends CharacterTag implements SoundStreamHeadTypeTag { - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int playBackSoundRate; - + public boolean playBackSoundSize; public boolean playBackSoundType; - - @SWFType(value=BasicType.UB,count=4) + + @SWFType(value = BasicType.UB, count = 4) public int streamSoundCompression; - - @SWFType(value=BasicType.UB,count=2) + + @SWFType(value = BasicType.UB, count = 2) public int streamSoundRate; - + public boolean streamSoundSize; public boolean streamSoundType; - + @SWFType(BasicType.UI16) public int streamSoundSampleCount; - + @SWFType(BasicType.SI16) - @Conditional(value="streamSoundCompression",options={2}) + @Conditional(value = "streamSoundCompression", options = {2}) public int latencySeek; - + @Internal private int virtualCharacterId = 0; public static final int ID = 45; @@ -103,12 +103,12 @@ public class SoundStreamHead2Tag extends CharacterTag implements SoundStreamHead try { sos.writeUB(4, 0);//reserved sos.writeUB(2, playBackSoundRate); - sos.writeUB(1, playBackSoundSize?1:0); - sos.writeUB(1, playBackSoundType?1:0); + sos.writeUB(1, playBackSoundSize ? 1 : 0); + sos.writeUB(1, playBackSoundType ? 1 : 0); sos.writeUB(4, streamSoundCompression); sos.writeUB(2, streamSoundRate); - sos.writeUB(1, streamSoundSize?1:0); - sos.writeUB(1, streamSoundType?1:0); + sos.writeUB(1, streamSoundSize ? 1 : 0); + sos.writeUB(1, streamSoundType ? 1 : 0); sos.writeUI16(streamSoundSampleCount); if (streamSoundCompression == 2) { sos.writeSI16(latencySeek); @@ -121,6 +121,7 @@ public class SoundStreamHead2Tag extends CharacterTag implements SoundStreamHead /** * Constructor * + * @param swf * @param data Data bytes * @param version SWF version * @param pos @@ -131,7 +132,7 @@ public class SoundStreamHead2Tag extends CharacterTag implements SoundStreamHead SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); sis.readUB(4);//reserved playBackSoundRate = (int) sis.readUB(2); - playBackSoundSize = sis.readUB(1) == 1; + playBackSoundSize = sis.readUB(1) == 1; playBackSoundType = sis.readUB(1) == 1; streamSoundCompression = (int) sis.readUB(4); streamSoundRate = (int) sis.readUB(2); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java index d447065b8..0cf9234a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java @@ -37,19 +37,19 @@ import java.io.OutputStream; */ public class SoundStreamHeadTag extends CharacterTag implements SoundStreamHeadTypeTag { - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int playBackSoundRate; public boolean playBackSoundSize; public boolean playBackSoundType; - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int streamSoundCompression; - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int streamSoundRate; public boolean streamSoundSize; public boolean streamSoundType; - @SWFType(value=BasicType.UI16) + @SWFType(value = BasicType.UI16) public int streamSoundSampleCount; - @Conditional(value="streamSoundCompression",options={2}) + @Conditional(value = "streamSoundCompression", options = {2}) public int latencySeek; @Internal private int virtualCharacterId = 0; @@ -95,12 +95,12 @@ public class SoundStreamHeadTag extends CharacterTag implements SoundStreamHeadT try { sos.writeUB(4, 0);//reserved sos.writeUB(2, playBackSoundRate); - sos.writeUB(1, playBackSoundSize?1:0); - sos.writeUB(1, playBackSoundType?1:0); + sos.writeUB(1, playBackSoundSize ? 1 : 0); + sos.writeUB(1, playBackSoundType ? 1 : 0); sos.writeUB(4, streamSoundCompression); sos.writeUB(2, streamSoundRate); - sos.writeUB(1, streamSoundSize?1:0); - sos.writeUB(1, streamSoundType?1:0); + sos.writeUB(1, streamSoundSize ? 1 : 0); + sos.writeUB(1, streamSoundType ? 1 : 0); sos.writeUI16(streamSoundSampleCount); if (streamSoundCompression == 2) { sos.writeSI16(latencySeek); @@ -115,6 +115,7 @@ public class SoundStreamHeadTag extends CharacterTag implements SoundStreamHeadT * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public SoundStreamHeadTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java index 68fa07dba..14806f6dc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java @@ -59,6 +59,7 @@ public class StartSound2Tag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public StartSound2Tag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java index 39f1e381b..5fbbeba62 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java @@ -63,6 +63,7 @@ public class StartSoundTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public StartSoundTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java index 6e7c65359..d3189142f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java @@ -65,6 +65,7 @@ public class VideoFrameTag extends Tag { * * @param data Data bytes * @param version SWF version + * @param pos * @throws IOException */ public VideoFrameTag(SWF swf, byte[] data, int version, long pos) throws IOException { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java index 48e03c5e3..d9461faef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java @@ -36,6 +36,7 @@ public interface ASMSource extends TreeItem { * @param version SWF version * @param exportMode PCode or hex? * @return ASM source + * @throws java.lang.InterruptedException */ public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException; @@ -51,6 +52,7 @@ public interface ASMSource extends TreeItem { * * @param version Version * @return List of actions + * @throws java.lang.InterruptedException */ public List getActions(int version) throws InterruptedException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java index 866459854..d16ff1ef8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java @@ -371,6 +371,7 @@ public final class TextLexer { /** * Closes the input stream. + * @throws java.io.IOException */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ @@ -405,6 +406,7 @@ public final class TextLexer { /** * Returns the current lexical state. + * @return */ public final int yystate() { return zzLexicalState; @@ -421,6 +423,7 @@ public final class TextLexer { /** * Returns the text matched by the current regular expression. + * @return */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); @@ -442,6 +445,7 @@ public final class TextLexer { /** * Returns the length of the matched text region. + * @return */ public final int yylength() { return zzMarkedPos - zzStartRead; @@ -493,6 +497,7 @@ public final class TextLexer { * * @return the next token * @exception java.io.IOException if any I/O-Error occurs + * @throws com.jpexs.decompiler.flash.tags.text.ParseException */ public ParsedSymbol yylex() throws java.io.IOException, ParseException { int zzInput; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java b/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java index ec0970e74..762ac635a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java @@ -34,17 +34,17 @@ public class ARGB { /** * Red color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int red; /** * Green color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int green; /** * Blue color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int blue; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java index 91934f2b7..d128b39b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java @@ -120,8 +120,8 @@ public class BUTTONCONDACTION implements ASMSource, Exportable, ContainerItem { /** * @since SWF 4 key code */ - @SWFType(value=BasicType.UB,count=7) - @Conditional(minSwfVersion=4) + @SWFType(value = BasicType.UB, count = 7) + @Conditional(minSwfVersion = 4) public int condKeyPress; /** * OverDown to Idle @@ -160,6 +160,7 @@ public class BUTTONCONDACTION implements ASMSource, Exportable, ContainerItem { * * @param version SWF version * @return ASM source + * @throws java.lang.InterruptedException */ @Override public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException { @@ -184,6 +185,7 @@ public class BUTTONCONDACTION implements ASMSource, Exportable, ContainerItem { * * @param version Version * @return List of actions + * @throws java.lang.InterruptedException */ @Override public List getActions(int version) throws InterruptedException { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java index 62bcb1fcf..300ffa702 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java @@ -56,7 +56,7 @@ public class BUTTONRECORD { /** * ID of character to place */ - @SWFType(BasicType.UI16) + @SWFType(BasicType.UI16) public int characterId; /** * Depth at which to place character @@ -80,7 +80,7 @@ public class BUTTONRECORD { * If within DefineButton2Tag and buttonHasBlendMode: Blend mode */ @SWFType(BasicType.UI8) - @Conditional(value={"buttonHasBlendMode"},tags={DefineButton2Tag.ID}) + @Conditional(value = {"buttonHasBlendMode"}, tags = {DefineButton2Tag.ID}) public int blendMode; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BasicType.java b/trunk/src/com/jpexs/decompiler/flash/types/BasicType.java index acfef4567..91092a1d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/BasicType.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BasicType.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types; /** @@ -22,8 +21,9 @@ package com.jpexs.decompiler.flash.types; * @author JPEXS */ public enum BasicType { + UI8, - UI16, + UI16, UI32, EncodedU32, SI8, diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java index 59a26c42b..97bbd8463 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java @@ -166,6 +166,7 @@ public class CLIPACTIONRECORD implements ASMSource, Exportable, ContainerItem { * * @param version SWF version * @return ASM source + * @throws java.lang.InterruptedException */ @Override public GraphTextWriter getASMSource(int version, ExportMode exportMode, GraphTextWriter writer, List actions) throws InterruptedException { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java index 78550ce6a..c6ddd2d2a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java @@ -63,37 +63,37 @@ public class CLIPEVENTFLAGS { /** * @since SWF 6 Mouse drag over event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventDragOver; /** * @since SWF 6 Mouse rollout event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventRollOut; /** * @since SWF 6 Mouse rollover event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventRollOver; /** * @since SWF 6 Mouse release outside event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventReleaseOutside; /** * @since SWF 6 Mouse release inside event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventRelease; /** * @since SWF 6 Mouse press event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventPress; /** * @since SWF 6 Initialize event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventInitialize; /** * Data received event @@ -102,17 +102,17 @@ public class CLIPEVENTFLAGS { /** * @since SWF 7 Construct event */ - @Conditional(minSwfVersion=7) + @Conditional(minSwfVersion = 7) public boolean clipEventConstruct = false; /** * @since SWF 6 Key press event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventKeyPress = false; /** * @since SWF 6 Mouse drag out event */ - @Conditional(minSwfVersion=6) + @Conditional(minSwfVersion = 6) public boolean clipEventDragOut = false; public String getHeader(int key, boolean asFileName) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java b/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java index 24b63e610..880588358 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java @@ -36,37 +36,37 @@ public class CXFORM { * Has color multiply values */ public boolean hasMultTerms; - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int nbits; /** * Red multiply value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int redMultTerm; /** * Green multiply value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int greenMultTerm; /** * Blue multiply value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int blueMultTerm; /** * Red addition value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int redAddTerm; /** * Green addition value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int greenAddTerm; /** * Blue addition value */ - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int blueAddTerm; public SerializableImage apply(SerializableImage src) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java b/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java index 7e3594ed4..bde4d0da4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java @@ -41,52 +41,52 @@ public class CXFORMWITHALPHA { * Red multiply value */ @Conditional("hasMultTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int redMultTerm; /** * Green multiply value */ @Conditional("hasMultTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int greenMultTerm; /** * Blue multiply value */ @Conditional("hasMultTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int blueMultTerm; /** * Alpha multiply value */ @Conditional("hasMultTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int alphaMultTerm; /** * Red addition value */ @Conditional("hasAddTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int redAddTerm; /** * Green addition value */ @Conditional("hasAddTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int greenAddTerm; /** * Blue addition value */ @Conditional("hasAddTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int blueAddTerm; /** * Alpha addition value */ @Conditional("hasAddTerms") - @SWFType(value=BasicType.SB,countField="nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int alphaAddTerm; - - @SWFType(value=BasicType.UB, count=4) + + @SWFType(value = BasicType.UB, count = 4) public int nbits; public SerializableImage apply(SerializableImage src) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java index 715be3478..2ac15e2e6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java @@ -43,20 +43,20 @@ public class FILLSTYLE implements NeedsCharacters { public static final int NON_SMOOTHED_CLIPPED_BITMAP = 0x43; @Internal public boolean inShape3; - @ConditionalType(type = RGBA.class,tags = DefineShape3Tag.ID) + @ConditionalType(type = RGBA.class, tags = DefineShape3Tag.ID) public RGB color; - - @Conditional(value="fillStyleType",options={LINEAR_GRADIENT,RADIAL_GRADIENT,FOCAL_RADIAL_GRADIENT}) + + @Conditional(value = "fillStyleType", options = {LINEAR_GRADIENT, RADIAL_GRADIENT, FOCAL_RADIAL_GRADIENT}) public MATRIX gradientMatrix; - - @Conditional(value="fillStyleType",options={LINEAR_GRADIENT,RADIAL_GRADIENT,FOCAL_RADIAL_GRADIENT}) - @ConditionalType(value="fillStyleType",type=FOCALGRADIENT.class, options={FOCAL_RADIAL_GRADIENT}) + + @Conditional(value = "fillStyleType", options = {LINEAR_GRADIENT, RADIAL_GRADIENT, FOCAL_RADIAL_GRADIENT}) + @ConditionalType(value = "fillStyleType", type = FOCALGRADIENT.class, options = {FOCAL_RADIAL_GRADIENT}) public GRADIENT gradient; - - @Conditional(value="fillStyleType",options={REPEATING_BITMAP,CLIPPED_BITMAP,NON_SMOOTHED_REPEATING_BITMAP,NON_SMOOTHED_CLIPPED_BITMAP}) + + @Conditional(value = "fillStyleType", options = {REPEATING_BITMAP, CLIPPED_BITMAP, NON_SMOOTHED_REPEATING_BITMAP, NON_SMOOTHED_CLIPPED_BITMAP}) public int bitmapId; - - @Conditional(value="fillStyleType",options={REPEATING_BITMAP,CLIPPED_BITMAP,NON_SMOOTHED_REPEATING_BITMAP,NON_SMOOTHED_CLIPPED_BITMAP}) + + @Conditional(value = "fillStyleType", options = {REPEATING_BITMAP, CLIPPED_BITMAP, NON_SMOOTHED_REPEATING_BITMAP, NON_SMOOTHED_CLIPPED_BITMAP}) public MATRIX bitmapMatrix; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java b/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java index cf0cd0e29..e80f4849f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java @@ -24,9 +24,9 @@ import com.jpexs.decompiler.flash.types.annotations.SWFType; */ public class GLYPHENTRY { - @SWFType(value=BasicType.UB,countField="+glyphBits") + @SWFType(value = BasicType.UB, countField = "+glyphBits") public int glyphIndex; - @SWFType(value=BasicType.SB,countField="advanceBits") + @SWFType(value = BasicType.SB, countField = "advanceBits") public int glyphAdvance; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java b/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java index 1b6cc82d9..e59d0cee3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java @@ -27,7 +27,7 @@ public class GRADIENT { /** * Spread mode */ - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int spreadMode; public static final int SPREAD_PAD_MODE = 0; public static final int SPREAD_REFLECT_MODE = 1; @@ -36,7 +36,7 @@ public class GRADIENT { /** * Interpolation mode */ - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int interpolationMode; public static final int INTERPOLATION_RGB_MODE = 0; public static final int INTERPOLATION_LINEAR_RGB_MODE = 1; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java index 2ef2a6027..efc179ffd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java @@ -27,7 +27,7 @@ public class GRADRECORD { @SWFType(BasicType.UI8) public int ratio; - + @Internal public boolean inShape3; public RGB color; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java index b72c2ab64..a633e2dc8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java @@ -32,12 +32,12 @@ import javax.swing.JPanel; */ public class KERNINGRECORD { - @SWFType(value=BasicType.UI8,alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") + @SWFType(value = BasicType.UI8, alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") public int fontKerningCode1; - - @SWFType(value=BasicType.UI8,alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") + + @SWFType(value = BasicType.UI8, alternateValue = BasicType.UI16, alternateCondition = "fontFlagsWideCodes") public int fontKerningCode2; - + @SWFType(BasicType.SI16) public int fontKerningAdjustment; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java b/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java index 202cf6a57..a142c4e82 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java @@ -36,8 +36,7 @@ public class LANGCODE { @Override public String toString() { - return "[LANGCODE:"+languageCode+"]"; + return "[LANGCODE:" + languageCode + "]"; } - - + } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java index 0620e0ac1..d166dd090 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java @@ -29,7 +29,7 @@ public class LINESTYLE { @SWFType(BasicType.UI16) public int width; - - @ConditionalType(tags = {DefineShape3Tag.ID,DefineShape4Tag.ID}, type=RGBA.class) + + @ConditionalType(tags = {DefineShape3Tag.ID, DefineShape4Tag.ID}, type = RGBA.class) public RGB color; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java index bc483e489..065ea1144 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java @@ -25,9 +25,9 @@ import com.jpexs.decompiler.flash.types.annotations.SWFType; */ public class LINESTYLE2 extends LINESTYLE { - @SWFType(value=BasicType.UB,count = 2) + @SWFType(value = BasicType.UB, count = 2) public int startCapStyle; - @SWFType(value=BasicType.UB,count = 2) + @SWFType(value = BasicType.UB, count = 2) public int joinStyle; public static final int ROUND_JOIN = 0; public static final int BEVEL_JOIN = 1; @@ -37,14 +37,14 @@ public class LINESTYLE2 extends LINESTYLE { public boolean noVScaleFlag; public boolean pixelHintingFlag; public boolean noClose; - @SWFType(value=BasicType.UB,count = 2) + @SWFType(value = BasicType.UB, count = 2) public int endCapStyle; public static final int ROUND_CAP = 0; public static final int NO_CAP = 1; public static final int SQUARE_CAP = 2; - + @SWFType(BasicType.UI16) - @Conditional(value="joinStyle",options = MITER_JOIN) + @Conditional(value = "joinStyle", options = MITER_JOIN) public int miterLimitFactor; public FILLSTYLE fillType; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java b/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java index ffddf65d2..216f6d5e2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java @@ -37,13 +37,13 @@ public class MATRIX implements Serializable { * X scale value */ @Conditional("hasScale") - @SWFType(value=BasicType.FB,countField = "nScaleBits") + @SWFType(value = BasicType.FB, countField = "nScaleBits") public int scaleX; /** * Y scale value */ @Conditional("hasScale") - @SWFType(value=BasicType.FB,countField = "nScaleBits") + @SWFType(value = BasicType.FB, countField = "nScaleBits") public int scaleY; /** * Has rotate and skew values @@ -53,34 +53,34 @@ public class MATRIX implements Serializable { * First rotate and skew value */ @Conditional("hasRotate") - @SWFType(value=BasicType.FB,countField = "nRotateBits") + @SWFType(value = BasicType.FB, countField = "nRotateBits") public int rotateSkew0; /** * Second rotate and skew value */ @Conditional("hasRotate") - @SWFType(value=BasicType.FB,countField = "nRotateBits") + @SWFType(value = BasicType.FB, countField = "nRotateBits") public int rotateSkew1; /** * X translate value in twips */ - @SWFType(value=BasicType.SB,countField = "nTranslateBits") + @SWFType(value = BasicType.SB, countField = "nTranslateBits") public int translateX; /** * Y translate value in twips */ - @SWFType(value=BasicType.SB,countField = "nTranslateBits") + @SWFType(value = BasicType.SB, countField = "nTranslateBits") public int translateY; - - @SWFType(value=BasicType.UB,count = 5) + + @SWFType(value = BasicType.UB, count = 5) public int nTranslateBits; - - @SWFType(value=BasicType.UB,count = 5) + + @SWFType(value = BasicType.UB, count = 5) public int nRotateBits; - - @SWFType(value=BasicType.UB,count = 5) + + @SWFType(value = BasicType.UB, count = 5) public int nScaleBits; - + public MATRIX() { } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java index 410fef7e4..036aab96e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java @@ -30,7 +30,7 @@ public class MORPHFILLSTYLE implements NeedsCharacters { @SWFType(BasicType.UI8) public int fillStyleType; - + public static final int SOLID = 0x0; public static final int LINEAR_GRADIENT = 0x10; public static final int RADIAL_GRADIENT = 0x12; @@ -38,29 +38,29 @@ public class MORPHFILLSTYLE implements NeedsCharacters { public static final int CLIPPED_BITMAP = 0x41; public static final int NON_SMOOTHED_REPEATING_BITMAP = 0x42; public static final int NON_SMOOTHED_CLIPPED_BITMAP = 0x43; - - @Conditional(value="fillStyleType",options = {SOLID}) + + @Conditional(value = "fillStyleType", options = {SOLID}) public RGBA startColor; - - @Conditional(value="fillStyleType",options = {SOLID}) + + @Conditional(value = "fillStyleType", options = {SOLID}) public RGBA endColor; - - @Conditional(value="fillStyleType",options = {LINEAR_GRADIENT,RADIAL_GRADIENT}) + + @Conditional(value = "fillStyleType", options = {LINEAR_GRADIENT, RADIAL_GRADIENT}) public MATRIX startGradientMatrix; - - @Conditional(value="fillStyleType",options = {LINEAR_GRADIENT,RADIAL_GRADIENT}) + + @Conditional(value = "fillStyleType", options = {LINEAR_GRADIENT, RADIAL_GRADIENT}) public MATRIX endGradientMatrix; - - @Conditional(value="fillStyleType",options = {LINEAR_GRADIENT,RADIAL_GRADIENT}) + + @Conditional(value = "fillStyleType", options = {LINEAR_GRADIENT, RADIAL_GRADIENT}) public MORPHGRADIENT gradient; - - @Conditional(value="fillStyleType",options = {CLIPPED_BITMAP,NON_SMOOTHED_REPEATING_BITMAP,NON_SMOOTHED_CLIPPED_BITMAP}) + + @Conditional(value = "fillStyleType", options = {CLIPPED_BITMAP, NON_SMOOTHED_REPEATING_BITMAP, NON_SMOOTHED_CLIPPED_BITMAP}) public int bitmapId; - - @Conditional(value="fillStyleType",options = {CLIPPED_BITMAP,NON_SMOOTHED_REPEATING_BITMAP,NON_SMOOTHED_CLIPPED_BITMAP}) + + @Conditional(value = "fillStyleType", options = {CLIPPED_BITMAP, NON_SMOOTHED_REPEATING_BITMAP, NON_SMOOTHED_CLIPPED_BITMAP}) public MATRIX startBitmapMatrix; - - @Conditional(value="fillStyleType",options = {CLIPPED_BITMAP,NON_SMOOTHED_REPEATING_BITMAP,NON_SMOOTHED_CLIPPED_BITMAP}) + + @Conditional(value = "fillStyleType", options = {CLIPPED_BITMAP, NON_SMOOTHED_REPEATING_BITMAP, NON_SMOOTHED_CLIPPED_BITMAP}) public MATRIX endBitmapMatrix; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java index 7a7a30d4f..4bda2e6f9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java @@ -28,17 +28,16 @@ public class MORPHGRADIENT { /** * Spread mode. See GRADIENT.SPREAD_* constants */ - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int spreadMode; /** * Interpolation mode. See GRADIENT.INTERPOLATION_* constants */ - @SWFType(value=BasicType.UB,count=2) + @SWFType(value = BasicType.UB, count = 2) public int interPolationMode; @Internal public int numGradients; - - + public MORPHGRADRECORD[] gradientRecords; public static RGBA morphColor(RGBA c1, RGBA c2, int ratio) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java index 664f0e039..254d1901e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java @@ -26,12 +26,12 @@ public class MORPHGRADRECORD { @SWFType(BasicType.UI8) public int startRatio; - + public RGBA startColor; - + @SWFType(BasicType.UI8) public int endRatio; - + public RGBA endColor; public GRADRECORD getStartRecord() { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java index f656ed2a6..488594722 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java @@ -29,9 +29,9 @@ public class MORPHLINESTYLE2 { public int startWidth; @SWFType(BasicType.UI16) public int endWidth; - @SWFType(value=BasicType.UB,count = 2) + @SWFType(value = BasicType.UB, count = 2) public int startCapStyle; - @SWFType(value=BasicType.UB,count = 2) + @SWFType(value = BasicType.UB, count = 2) public int joinStyle; public static final int ROUND_JOIN = 0; public static final int BEVEL_JOIN = 1; @@ -41,25 +41,25 @@ public class MORPHLINESTYLE2 { public boolean noVScaleFlag; public boolean pixelHintingFlag; public boolean noClose; - - @SWFType(value=BasicType.UB,count = 2) + + @SWFType(value = BasicType.UB, count = 2) public int endCapStyle; - + public static final int ROUND_CAP = 0; public static final int NO_CAP = 1; public static final int SQUARE_CAP = 2; - - @SWFType(value=BasicType.UI16) - @Conditional(value="joinStyle",options = {MITER_JOIN}) + + @SWFType(value = BasicType.UI16) + @Conditional(value = "joinStyle", options = {MITER_JOIN}) public int miterLimitFactor; - - @Conditional(value="hasFillFlag",revert = true) + + @Conditional(value = "hasFillFlag", revert = true) public RGBA startColor; - - @Conditional(value="hasFillFlag",revert = true) + + @Conditional(value = "hasFillFlag", revert = true) public RGBA endColor; - - @Conditional(value="hasFillFlag") + + @Conditional(value = "hasFillFlag") public MORPHFILLSTYLE fillType; public LINESTYLE2 getLineStyle2At(int ratio) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java b/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java index 076921727..67c9ab6df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java @@ -28,16 +28,16 @@ public class PIX15 { /** * Red color value */ - @SWFType(value=BasicType.UB, count = 5) + @SWFType(value = BasicType.UB, count = 5) public int red; /** * Green color value */ - @SWFType(value=BasicType.UB, count = 5) + @SWFType(value = BasicType.UB, count = 5) public int green; /** * Blue color value */ - @SWFType(value=BasicType.UB, count = 5) + @SWFType(value = BasicType.UB, count = 5) public int blue; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/RECT.java b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java index 92ec6bc79..77471c319 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/RECT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java @@ -30,28 +30,28 @@ public class RECT implements Serializable { /** * X minimum position for rectangle in twips */ - @SWFType(value=BasicType.SB, countField = "nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int Xmin; - + /** * X maximum position for rectangle in twips */ - @SWFType(value=BasicType.SB, countField = "nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int Xmax; - + /** * Y minimum position for rectangle in twips */ - @SWFType(value=BasicType.SB, countField = "nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int Ymin; - + /** * Y maximum position for rectangle in twips */ - @SWFType(value=BasicType.SB, countField = "nbits") + @SWFType(value = BasicType.SB, countField = "nbits") public int Ymax; - - @SWFType(value=BasicType.UB, count = 5) + + @SWFType(value = BasicType.UB, count = 5) public int nbits; public RECT(int Xmin, int Xmax, int Ymin, int Ymax) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/RGB.java b/trunk/src/com/jpexs/decompiler/flash/types/RGB.java index f08d2913f..268c57c9f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/RGB.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RGB.java @@ -29,17 +29,17 @@ public class RGB { /** * Red color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int red; /** * Green color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int green; /** * Blue color value */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int blue; public RGB(int red, int green, int blue) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java b/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java index de7b32a0b..82f92570d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java @@ -29,7 +29,7 @@ public class RGBA extends RGB { /** * Alpha value defining opacity */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int alpha; public float getAlphaFloat() { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java b/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java index 4c4752d52..38277fced 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java @@ -29,9 +29,9 @@ import java.util.Set; */ public class SHAPE implements NeedsCharacters { - @SWFType(value=BasicType.UB, count=4) + @SWFType(value = BasicType.UB, count = 4) public int numFillBits; - @SWFType(value=BasicType.UB, count=4) + @SWFType(value = BasicType.UB, count = 4) public int numLineBits; public List shapeRecords; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java index 2e55d3417..ed15aabd4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java @@ -31,19 +31,19 @@ public class SOUNDINFO { public boolean hasLoops; public boolean hasOutPoint; public boolean hasInPoint; - + @Conditional("hasInPoint") @SWFType(BasicType.UI32) public long inPoint; - + @Conditional("hasOutPoint") @SWFType(BasicType.UI32) public long outPoint; - + @Conditional("hasLoops") @SWFType(BasicType.UI16) public int loopCount; - + @Conditional("hasEnvelope") public SOUNDENVELOPE[] envelopeRecords = new SOUNDENVELOPE[0]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java index 70f1c1815..392778518 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java @@ -34,29 +34,29 @@ public class TEXTRECORD { public boolean styleFlagsHasColor; public boolean styleFlagsHasYOffset; public boolean styleFlagsHasXOffset; - + @Conditional("styleFlagsHasFont") @SWFType(BasicType.UI16) public int fontId; - - @Conditional(value="styleFlagsHasColor", tags = {DefineTextTag.ID}) + + @Conditional(value = "styleFlagsHasColor", tags = {DefineTextTag.ID}) public RGB textColor; - - @Conditional(value="styleFlagsHasColor", tags = {DefineText2Tag.ID}) + + @Conditional(value = "styleFlagsHasColor", tags = {DefineText2Tag.ID}) public RGBA textColorA; - + @Conditional("styleFlagsHasXOffset") @SWFType(BasicType.SI16) public int xOffset; - + @Conditional("styleFlagsHasYOffset") @SWFType(BasicType.SI16) public int yOffset; - + @Conditional("styleFlagsHasFont") @SWFType(BasicType.UI16) public int textHeight; - + public GLYPHENTRY[] glyphEntries; public String getText(List tags, FontTag font) { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Conditional.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Conditional.java index 1f4dd632f..b0a6e1330 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Conditional.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Conditional.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import java.lang.annotation.ElementType; @@ -24,21 +23,28 @@ import java.lang.annotation.Target; /** * Mark for field that it is available only whern certain field (value) is set + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Conditional { + ///Name of field on which this depends String[] value() default {}; + ///Tag IDs which this field must be in int[] tags() default {}; + ///Minimum SWF version for this field int minSwfVersion() default 1; + ///Maximum SWF version for this field int maxSwfVersion() default Integer.MAX_VALUE; + ///List of values for condition (if true/false is not enough) int[] options() default {}; + ///Revert condition (if false...) boolean revert() default false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/ConditionalType.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/ConditionalType.java index 09c029450..767ef0247 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/ConditionalType.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/ConditionalType.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import java.lang.annotation.ElementType; @@ -24,23 +23,31 @@ import java.lang.annotation.Target; /** * Mark for field that its type is different whern certain field (value) is set + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface ConditionalType { +public @interface ConditionalType { + ///Name of field on which this depends String[] value() default {}; + ///Tag IDs which this field must be in int[] tags() default {}; + ///Minimum SWF version for this field int minSwfVersion() default 1; + ///Maximum SWF version for this field int maxSwfVersion() default Integer.MAX_VALUE; + ///List of values for condition (if true/false is not enough) int[] options() default {}; + ///Revert condition (if false...) boolean revert() default false; + ///Field type when condition is met Class type(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Internal.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Internal.java index 577f87804..f4ab225de 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Internal.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Internal.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import java.lang.annotation.ElementType; @@ -24,10 +23,11 @@ import java.lang.annotation.Target; /** * Field is internal + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Internal { - + } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Optional.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Optional.java index 233d2c7f7..44173f153 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Optional.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Optional.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import java.lang.annotation.ElementType; @@ -24,10 +23,11 @@ import java.lang.annotation.Target; /** * The field is optional anc can be unset + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Optional { - + } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Reserved.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Reserved.java index a5f4e2842..dd330bc99 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/Reserved.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/Reserved.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import java.lang.annotation.ElementType; @@ -24,6 +23,7 @@ import java.lang.annotation.Target; /** * Field is reserved + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) diff --git a/trunk/src/com/jpexs/decompiler/flash/types/annotations/SWFType.java b/trunk/src/com/jpexs/decompiler/flash/types/annotations/SWFType.java index e6147dec4..11a9e862e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/annotations/SWFType.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/annotations/SWFType.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.jpexs.decompiler.flash.types.annotations; import com.jpexs.decompiler.flash.types.BasicType; @@ -25,21 +24,28 @@ import java.lang.annotation.Target; /** * Maps basic java types (int,float,double) to SWF types (UI8,UI16...FLOAT) + * * @author JPEXS */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface SWFType { + /// Type of value BasicType value(); + /// Alternate type when condition is met BasicType alternateValue() default BasicType.NONE; + /// Condition for alternate type String alternateCondition() default ""; + /// Count - used primarily for bit fields UB,SB,FB to specify number of bits int count() default -1; + /// Field name on which Count depends String countField() default ""; + //Count to add to countField int countAdd() default 0; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java index 6071a5e34..48c7ceb9d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java @@ -41,7 +41,7 @@ public class BEVELFILTER extends FILTER { */ @SWFType(BasicType.FIXED) public double blurX; - + /** * Vertical blur amount */ @@ -81,7 +81,7 @@ public class BEVELFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int passes; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java index 9eaf5f18a..2ba7ed0a9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java @@ -40,7 +40,7 @@ public class BLURFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=5) + @SWFType(value = BasicType.UB, count = 5) public int passes; public BLURFILTER() { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/BlendComposite.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/BlendComposite.java index 6814be70d..253d4f25a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/BlendComposite.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/BlendComposite.java @@ -93,6 +93,7 @@ public final class BlendComposite implements Composite { /** * {@inheritDoc} + * @return */ @Override public int hashCode() { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java index ee4af99a8..b954830ea 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java @@ -30,7 +30,7 @@ public class COLORMATRIXFILTER extends FILTER { /** * Color matrix values */ - @SWFType(BasicType.FLOAT) + @SWFType(BasicType.FLOAT) public float[] matrix = new float[20]; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java index a909d62d3..bad9a80fc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java @@ -36,7 +36,7 @@ public class CONVOLUTIONFILTER extends FILTER { /** * Vertical matrix size */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int matrixY; /** * Divisor applied to the matrix values diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java index 2c24fe0f9..0fd8f9a42 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java @@ -72,7 +72,7 @@ public class DROPSHADOWFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=5) + @SWFType(value = BasicType.UB, count = 5) public int passes; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java index 0a698af13..e2bca268c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java @@ -30,7 +30,7 @@ public class FILTER { /** * Identificator of type of the filter */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int id; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java index 1c2929576..2e707f343 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java @@ -62,7 +62,7 @@ public class GLOWFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=5) + @SWFType(value = BasicType.UB, count = 5) public int passes; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java index cc9a10b40..1338854e1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java @@ -33,12 +33,12 @@ public class GRADIENTBEVELFILTER extends FILTER { /** * Gradient colors - */ + */ public RGBA[] gradientColors = new RGBA[0]; /** * Gradient ratios */ - @SWFType(BasicType.UI8) + @SWFType(BasicType.UI8) public int[] gradientRatio = new int[0]; /** * Horizontal blur amount @@ -84,7 +84,7 @@ public class GRADIENTBEVELFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int passes; public GRADIENTBEVELFILTER() { diff --git a/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java index 987704f72..3489d809c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java @@ -84,7 +84,7 @@ public class GRADIENTGLOWFILTER extends FILTER { /** * Number of blur passes */ - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int passes; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java index 5e9f19e81..92ba37b41 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java @@ -28,20 +28,20 @@ public class CurvedEdgeRecord extends SHAPERECORD { public boolean typeFlag = true; public boolean straightFlag = false; - - @SWFType(value=BasicType.UB,count=4) + + @SWFType(value = BasicType.UB, count = 4) public int numBits; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) public int controlDeltaX; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) public int controlDeltaY; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) public int anchorDeltaX; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) public int anchorDeltaY; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java index 2b194d502..fec8c27f5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java @@ -26,7 +26,7 @@ import com.jpexs.decompiler.flash.types.annotations.SWFType; public class EndShapeRecord extends SHAPERECORD { public boolean typeFlag = false; - @SWFType(value=BasicType.UB,count=5) + @SWFType(value = BasicType.UB, count = 5) public int endOfShape = 0; @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java index e72659dd9..8f9265bbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java @@ -28,30 +28,30 @@ import com.jpexs.decompiler.flash.types.annotations.SWFType; public class StraightEdgeRecord extends SHAPERECORD { /* - if (!ser.generalLineFlag) { - ser.vertLineFlag = readUB(1) == 1; - } - if (ser.generalLineFlag || (!ser.vertLineFlag)) { - ser.deltaX = (int) readSB(ser.numBits + 2); - } - if (ser.generalLineFlag || (ser.vertLineFlag)) { - ser.deltaY = (int) readSB(ser.numBits + 2); - } - */ + if (!ser.generalLineFlag) { + ser.vertLineFlag = readUB(1) == 1; + } + if (ser.generalLineFlag || (!ser.vertLineFlag)) { + ser.deltaX = (int) readSB(ser.numBits + 2); + } + if (ser.generalLineFlag || (ser.vertLineFlag)) { + ser.deltaY = (int) readSB(ser.numBits + 2); + } + */ public int typeFlag = 1; public int straightFlag = 1; - @SWFType(value=BasicType.UB,count=4) + @SWFType(value = BasicType.UB, count = 4) public int numBits; public boolean generalLineFlag; - - @Conditional(value="generalLineFlag",revert = true) + + @Conditional(value = "generalLineFlag", revert = true) public boolean vertLineFlag; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) @Conditional("generalLineFlag|!vertLineFlag") public int deltaX; - - @SWFType(value=BasicType.SB,countField = "numBits",countAdd = 2) + + @SWFType(value = BasicType.SB, countField = "numBits", countAdd = 2) @Conditional("generalLineFlag|vertLineFlag") public int deltaY; diff --git a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java index e1fe5bd24..688b37b93 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java @@ -38,40 +38,40 @@ public class StyleChangeRecord extends SHAPERECORD implements Cloneable { public boolean stateFillStyle1; public boolean stateFillStyle0; public boolean stateMoveTo; - - @SWFType(value=BasicType.UB,count=5) + + @SWFType(value = BasicType.UB, count = 5) @Conditional("stateMoveTo") public int moveBits; - - @SWFType(value=BasicType.SB,countField = "moveBits") - @Conditional("stateMoveTo") + + @SWFType(value = BasicType.SB, countField = "moveBits") + @Conditional("stateMoveTo") public int moveDeltaX; - - @SWFType(value=BasicType.SB,countField = "moveBits") - @Conditional("stateMoveTo") + + @SWFType(value = BasicType.SB, countField = "moveBits") + @Conditional("stateMoveTo") public int moveDeltaY; - - @SWFType(value=BasicType.UB,countField = "fillBits") //last defined fillBits - @Conditional("stateFillStyle0") + + @SWFType(value = BasicType.UB, countField = "fillBits") //last defined fillBits + @Conditional("stateFillStyle0") public int fillStyle0; - - @SWFType(value=BasicType.UB,countField = "fillBits") //last defined fillBits - @Conditional("stateFillStyle1") + + @SWFType(value = BasicType.UB, countField = "fillBits") //last defined fillBits + @Conditional("stateFillStyle1") public int fillStyle1; - - @SWFType(value=BasicType.UB,countField = "lineBits") //last defined lineBits - @Conditional("stateLineStyle") + + @SWFType(value = BasicType.UB, countField = "lineBits") //last defined lineBits + @Conditional("stateLineStyle") public int lineStyle; - + @Conditional("stateNewStyles") public FILLSTYLEARRAY fillStyles; - + @Conditional("stateNewStyles") public LINESTYLEARRAY lineStyles; - + @Conditional("stateNewStyles") public int numFillBits; - + @Conditional("stateNewStyles") public int numLineBits; diff --git a/trunk/src/com/jpexs/decompiler/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java index 94f0251f9..8e4a9489b 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -2157,6 +2157,7 @@ public class Graph { * @param tree List of TreeItem * @param localData * @return String + * @throws java.lang.InterruptedException */ public static GraphTextWriter graphToString(List tree, GraphTextWriter writer, LocalData localData) throws InterruptedException { for (GraphTargetItem ti : tree) { diff --git a/trunk/src/com/jpexs/helpers/Cache.java b/trunk/src/com/jpexs/helpers/Cache.java index fbd1ae355..eb169a0c7 100644 --- a/trunk/src/com/jpexs/helpers/Cache.java +++ b/trunk/src/com/jpexs/helpers/Cache.java @@ -34,6 +34,7 @@ import java.util.logging.Logger; /** * * @author JPEXS + * @param */ public class Cache { diff --git a/trunk/src/com/jpexs/helpers/Callback.java b/trunk/src/com/jpexs/helpers/Callback.java index 84b04598f..075cab1b3 100644 --- a/trunk/src/com/jpexs/helpers/Callback.java +++ b/trunk/src/com/jpexs/helpers/Callback.java @@ -20,6 +20,7 @@ package com.jpexs.helpers; * Class with helper method * * @author JPEXS + * @param */ public abstract class Callback { diff --git a/trunk/src/com/jpexs/helpers/CancellableWorker.java b/trunk/src/com/jpexs/helpers/CancellableWorker.java index 190271c59..955af410e 100644 --- a/trunk/src/com/jpexs/helpers/CancellableWorker.java +++ b/trunk/src/com/jpexs/helpers/CancellableWorker.java @@ -31,6 +31,7 @@ import java.util.concurrent.TimeoutException; /** * * @author JPEXS + * @param */ public abstract class CancellableWorker implements RunnableFuture { diff --git a/trunk/src/com/sun/jna/platform/win32/Gdi32.java b/trunk/src/com/sun/jna/platform/win32/Gdi32.java index 5bfbf0fa7..c09f1efdb 100644 --- a/trunk/src/com/sun/jna/platform/win32/Gdi32.java +++ b/trunk/src/com/sun/jna/platform/win32/Gdi32.java @@ -308,6 +308,7 @@ public interface Gdi32 extends StdCallLibrary { * the desired format for the DIB data. * @param uUsage The format of the bmiColors member of the {@link * BITMAPINFO} structure. + * @return */ int GetDIBits(HDC hdc, HBITMAP hbmp, int uStartScan, int cScanLines, Pointer lpvBits, BITMAPINFO lpbi, int uUsage); diff --git a/trunk/src/com/sun/jna/platform/win32/Shell32.java b/trunk/src/com/sun/jna/platform/win32/Shell32.java index 51068b762..361de2806 100644 --- a/trunk/src/com/sun/jna/platform/win32/Shell32.java +++ b/trunk/src/com/sun/jna/platform/win32/Shell32.java @@ -28,6 +28,7 @@ public interface Shell32 extends StdCallLibrary { W32APIOptions.UNICODE_OPTIONS); /** + * @param lpExecInfo * @return true if successful. Otherwise false. */ boolean ShellExecuteEx(SHELLEXECUTEINFO lpExecInfo); diff --git a/trunk/src/com/sun/jna/platform/win32/WinNT.java b/trunk/src/com/sun/jna/platform/win32/WinNT.java index ddc9597e7..01069c719 100644 --- a/trunk/src/com/sun/jna/platform/win32/WinNT.java +++ b/trunk/src/com/sun/jna/platform/win32/WinNT.java @@ -279,6 +279,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { /** * Initialize a TOKEN_PRIVILEGES instance from initialized memory. + * @param p */ public TOKEN_PRIVILEGES(Pointer p) { super(p); @@ -488,6 +489,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { /** * WARNING: this filename may be either the short or long form of the * filename. + * @return */ public String getFilename() { return new String(FileName, 0, FileNameLength / 2); @@ -785,6 +787,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { /** * Override to the appropriate object for INVALID_HANDLE_VALUE. + * @return */ @Override public Object fromNative(Object nativeValue, FromNativeContext context) { diff --git a/trunk/src/com/sun/jna/platform/win32/WinUser.java b/trunk/src/com/sun/jna/platform/win32/WinUser.java index 35d7ef2d7..f4631b4ce 100644 --- a/trunk/src/com/sun/jna/platform/win32/WinUser.java +++ b/trunk/src/com/sun/jna/platform/win32/WinUser.java @@ -195,6 +195,7 @@ public interface WinUser extends StdCallLibrary, WinDef { /** * Return whether to continue enumeration. + * @return */ boolean callback(HWND hWnd, Pointer data); }