LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-16 15:20:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated build script

Browse Source 
few javadoc fixes
This commit is contained in:
Jindra Petk
2013-04-23 22:28:18 +02:00
parent f490132845
commit e479932693
13 changed files with 398 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
trunk/build.xml
View File

@@ -1,158 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="ASDec" default="build" basedir=".">
<description>Builds project ASDec.</description>
<import file="buildconfig.xml"/>
<property name="DISTLIBRARIESFULLDIR" value="${DISTRIBUTIONDIR}/${DISTLIBRARIESDIR}"/>
<property name="JAVADOCFULLDIR" value="${DISTRIBUTIONDIR}/${JAVADOCDIR}"/>
<patternset id="compiler.resources">
<include name="**/?*.properties"/>
<include name="**/?*.bin"/>
<include name="**/?*.xml"/>
<include name="**/?*.txt"/>
<include name="**/?*.gif"/>
<include name="**/?*.png"/>
<include name="**/?*.jpeg"/>
<include name="**/?*.jpg"/>
<include name="**/?*.html"/>
<include name="**/?*.dtd"/>
<include name="**/?*.tld"/>
<include name="**/?*.mid"/>
<include name="**/?*.wav"/>
</patternset>
<path id="emma.lib">
<pathelement location="${TESTLIBDIR}/emma.jar"/>
<pathelement location="${TESTLIBDIR}/emma_ant.jar"/>
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
<target name="coverage.instrumentation">
<mkdir dir="${INSTRDIR}"/>
<mkdir dir="${COVERAGEDIR}"/>
<emma>
<instr instrpath="${COMPILEDIR}" destdir="${INSTRDIR}" metadatafile="${COVERAGEDIR}/metadata.emma"
mode="copy"></instr>
</emma>
<copy todir="${INSTRDIR}">
<fileset dir="${SOURCEDIR}">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile">
<delete dir="${COMPILEDIR}"/>
<mkdir dir="${COMPILEDIR}"/>
<javac srcdir="${SOURCEDIR}" destdir="${COMPILEDIR}" includes="**/*.java" target="1.6" debug="true"
debuglevel="lines,vars,source" includeantruntime="false">
<classpath>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
</classpath>
</javac>
<copy todir="${COMPILEDIR}">
<fileset dir="${SOURCEDIR}">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="test" depends="clean,compile">
<delete dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}/raw/"/>
<delete dir="${COMPILETESTSDIR}"/>
<mkdir dir="${COMPILETESTSDIR}"/>
<javac srcdir="${TESTDIR}" destdir="${COMPILETESTSDIR}" includes="**/*.java" target="1.6" debug="true" includeantruntime="false">
<classpath>
<pathelement path="${COMPILEDIR}"/>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
<fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
</classpath>
</javac>
<antcall target="coverage.instrumentation"/>
<junit printsummary="yes" haltonfailure="yes" showoutput="yes">
<classpath>
<pathelement path="${INSTRDIR}"/>
<pathelement path="${COMPILEDIR}"/>
<pathelement path="${COMPILETESTSDIR}"/>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
<fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
</classpath>
<jvmarg value="-Demma.coverage.out.file=${COVERAGEDIR}/coverage.emma"/>
<jvmarg value="-Demma.coverage.out.merge=true"/>
<batchtest fork="yes" todir="${TESTRESULTSDIR}/raw/">
<formatter type="xml"/>
<fileset dir="${TESTDIR}">
<include name="**/*.java"/>
</fileset>
</batchtest>
</junit>
<!-- JUnit report -->
<junitreport todir="${TESTRESULTSDIR}">
<fileset dir="${TESTRESULTSDIR}/raw/">
<include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${TESTRESULTSDIR}\html\"/>
</junitreport>
<!-- Coverage report -->
<mkdir dir="${COVERAGERESULTSDIR}"/>
<emma>
<report sourcepath="${SOURCEDIR}" depth="method">
<fileset dir="${COVERAGEDIR}">
<include name="*.emma"/>
</fileset>
<html outfile="${COVERAGERESULTSDIR}/index.html"/>
</report>
</emma>
</target>
<target name="build" depends="clean,compile">
<mkdir dir="${DISTRIBUTIONDIR}"/>
<delete dir="${DISTLIBRARIESFULLDIR}"/>
<mkdir dir="${DISTLIBRARIESFULLDIR}"/>
<copy todir="${DISTLIBRARIESFULLDIR}">
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
</copy>
<pathconvert pathsep=" " property="manifestClassPath">
<fileset dir="${DISTRIBUTIONDIR}" includes="${DISTLIBRARIESDIR}/**/*.*"/>
<chainedmapper>
<flattenmapper/>
<globmapper from="*" to="${DISTLIBRARIESDIR}/*"/>
</chainedmapper>
</pathconvert>
<jar destfile="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" basedir="${COMPILEDIR}">
<manifest>
<attribute name="Main-Class" value="${MAINCLASS}"/>
<attribute name="Class-Path" value="${manifestClassPath}"/>
</manifest>
</jar>
</target>
<target name="run" depends="build">
<java jar="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" fork="true"/>
</target>
<target name="javadoc">
<mkdir dir="${JAVADOCFULLDIR}"/>
<javadoc sourcepath="${SOURCEDIR}" destdir="${JAVADOCFULLDIR}" windowtitle="${PROJECTNAME}"
useexternalfile="yes">
<fileset dir="${SOURCEDIR}" includes="**/*.java"/>
<classpath>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
</classpath>
</javadoc>
</target>
<target name="clean">
<delete dir="${DISTRIBUTIONDIR}"/>
<delete dir="${COMPILETESTSDIR}"/>
<delete dir="${COMPILEDIR}"/>
<delete dir="${COVERAGEDIR}"/>
<delete dir="${TESTRESULTSDIR}"/>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project name="FFDec" basedir="." default="all">
<description>Builds project FFDec</description>
<property name="VERSION" value="1.5.0u1" />
<property name="VERSIONNUMBER" value="1.5.0.1" />
<property name="BUILDER" value="jpexs" />
<property name="PROJECTNAME" value="FFDec"/>
<property name="JARFILENAME" value="ffdec"/>
<property name="EXEFILENAME" value="ffdec"/>
<property name="EXEICON" value="${basedir}/graphics/icon_ffdec.ico"/>
<property name="MINJAVAVERSION" value="1.6.0"/>
<property name="VENDOR" value="JPEXS" />
<property name="INTERNALNAME" value="FFDec" />
<property name="PRODUCTNAME" value="JPEXS Free Flash Decompiler" />
<property name="MAINCLASS" value="com.jpexs.decompiler.flash.Main"/>
<property name="INNOSETUPPATH" value="c:\program files (x86)\inno setup 5"/>
<property name="LAUNCH4JPATH" value="c:\program files (x86)\launch4j" />
<property name="SOURCEDIR" value="${basedir}/src"/>
<property name="RESOURCESDIR" value="${basedir}/resources"/>
<property name="TESTDIR" value="${basedir}/test"/>
<property name="TESTLIBDIR" value="${basedir}/testlib"/>
<property name="TESTRESULTSDIR" value="${basedir}/reports/tests"/>
<property name="COVERAGERESULTSDIR" value="${basedir}/reports/coverage"/>
<property name="DISTRIBUTIONDIR" value="${basedir}/dist"/>
<property name="COMPILEDIR" value="${basedir}/build/classes"/>
<property name="INSTRDIR" value="${basedir}/build/instr-classes"/>
<property name="COVERAGEDIR" value="${basedir}/coverage"/>
<property name="COMPILETESTSDIR" value="${basedir}/build/test"/>
<property name="LIBRARIESDIR" value="${basedir}/lib"/>
<property name="PROPERTIESNAME" value="project.properties"/>
<property name="RELEASESDIR" value="${basedir}/releases"/>
<property name="DISTLIBRARIESDIRNAME" value="lib"/>
<property name="JAVADOCDIR" value="${basedir}/javadoc"/>
<property name="ZIPNAME" value="ffdec_${VERSION}.zip"/>
<property name="INSTALLERCONFIG" value="${basedir}/installer.cfg"/>
<property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
<property name="EXECONFIG" value="${basedir}/build_exe.xml"/>
<import file="build_common.xml"/>
</project>

258
trunk/build_common.xml Normal file
View File

@@ -0,0 +1,258 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="common build script" default="all" basedir=".">
<description>Builds project</description>
<property name="DISTLIBRARIESFULLDIR" value="${DISTRIBUTIONDIR}/${DISTLIBRARIESDIRNAME}"/>
<patternset id="compiler.resources">
<include name="**/?*.properties"/>
<include name="**/?*.bin"/>
<include name="**/?*.xml"/>
<include name="**/?*.txt"/>
<include name="**/?*.gif"/>
<include name="**/?*.png"/>
<include name="**/?*.jpeg"/>
<include name="**/?*.jpg"/>
<include name="**/?*.html"/>
<include name="**/?*.dtd"/>
<include name="**/?*.tld"/>
<include name="**/?*.mid"/>
<include name="**/?*.wav"/>
</patternset>
<path id="emma.lib">
<pathelement location="${TESTLIBDIR}/emma.jar"/>
<pathelement location="${TESTLIBDIR}/emma_ant.jar"/>
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
<target name="coverage.instrumentation">
<mkdir dir="${INSTRDIR}"/>
<mkdir dir="${COVERAGEDIR}"/>
<emma>
<instr instrpath="${COMPILEDIR}" destdir="${INSTRDIR}" metadatafile="${COVERAGEDIR}/metadata.emma"
mode="copy">
</instr>
</emma>
<copy todir="${INSTRDIR}">
<fileset dir="${SOURCEDIR}">
<patternset refid="compiler.resources" />
<type type="file" />
</fileset>
</copy>
</target>
<target name="compile">
<delete dir="${COMPILEDIR}"/>
<mkdir dir="${COMPILEDIR}"/>
<javac srcdir="${SOURCEDIR}" destdir="${COMPILEDIR}" includes="**/*.java" target="1.6" source="1.6" debug="true"
debuglevel="lines,vars,source" includeantruntime="false">
<classpath>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
</classpath>
</javac>
<copy todir="${COMPILEDIR}">
<fileset dir="${SOURCEDIR}">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="test" depends="clean,compile">
<delete dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}/raw/"/>
<delete dir="${COMPILETESTSDIR}"/>
<mkdir dir="${COMPILETESTSDIR}"/>
<javac srcdir="${TESTDIR}" destdir="${COMPILETESTSDIR}" includes="**/*.java" target="1.6" debug="true" includeantruntime="false">
<classpath>
<pathelement path="${COMPILEDIR}"/>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
<fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
</classpath>
</javac>
<antcall target="coverage.instrumentation"/>
<taskdef classname="org.testng.TestNGAntTask" classpath="${TESTLIBDIR}/testng-6.8.jar" name="testng" />
<testng
outputDir="${TESTRESULTSDIR}"
haltOnFailure="true" verbose="2" workingDir="${basedir}">
<classpath>
<pathelement path="${COMPILETESTSDIR}"/>
<pathelement path="${INSTRDIR}"/>
<pathelement path="${COMPILEDIR}"/>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
<fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
</classpath>
<jvmarg value="-Demma.coverage.out.file=${COVERAGEDIR}/coverage.emma"/>
<jvmarg value="-Demma.coverage.out.merge=true"/>
<classfileset dir="${COMPILETESTSDIR}" includes="**/*.class" />
</testng>
<!-- Coverage report -->
<mkdir dir="${COVERAGERESULTSDIR}"/>
<emma>
<report sourcepath="${SOURCEDIR}" depth="method">
<fileset dir="${COVERAGEDIR}">
<include name="*.emma"/>
</fileset>
<html outfile="${COVERAGERESULTSDIR}/index.html" />
</report>
</emma>
</target>
<condition property="is_windows">
<os family="windows"/>
</condition>
<target name="installer" depends="dist" if="is_windows">
<echo message="#define MyAppVersion &quot;${VERSION}&quot;" file="${INSTALLERCONFIG}" />
<exec dir="${basedir}" executable="${INNOSETUPPATH}\iscc.exe">
<arg file="${INSTALLERPROJECT}" />
</exec>
</target>
<target name="archive" depends="dist">
<mkdir dir="${RELEASESDIR}"/>
<zip destfile="${RELEASESDIR}/${ZIPNAME}" basedir="${DISTRIBUTIONDIR}" />
</target>
<target name="-exe-config">
<echoxml file="${EXECONFIG}">
<launch4jConfig>
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<jar>${JARFILENAME}.jar</jar>
<outfile>${DISTRIBUTIONDIR}/${EXEFILENAME}.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir></chdir>
<priority>normal</priority>
<downloadUrl>http://java.com/download</downloadUrl>
<supportUrl></supportUrl>
<customProcName>false</customProcName>
<stayAlive>false</stayAlive>
<manifest></manifest>
<icon>${EXEICON}</icon>
<jre>
<path></path>
<minVersion>${MINJAVAVERSION}</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
</jre>
<versionInfo>
<fileVersion>${VERSIONNUMBER}</fileVersion>
<txtFileVersion>${VERSION}</txtFileVersion>
<fileDescription>${PRODUCTNAME}</fileDescription>
<copyright>${VENDOR}</copyright>
<productVersion>${VERSIONNUMBER}</productVersion>
<txtProductVersion>${VERSION}</txtProductVersion>
<productName>${PRODUCTNAME}</productName>
<companyName></companyName>
<internalName>${INTERNALNAME}</internalName>
<originalFilename>${EXEFILENAME}.exe</originalFilename>
</versionInfo>
</launch4jConfig>
</echoxml>
</target>
<target name="-exe-linux" unless="is_windows" depends="-exe-config">
<exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}/launch4j">
<arg file="${EXECONFIG}" />
</exec>
</target>
<target name="-exe-windows" if="is_windows" depends="-exe-config">
<exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}\launch4jc.exe">
<arg file="${EXECONFIG}" />
</exec>
</target>
<target name="exe" depends="-exe-linux,-exe-windows">
</target>
<target name="release">
<antcall target="archive" />
<antcall target="installer" />
</target>
<target name="all">
<antcall target="clean" />
<antcall target="test" />
<antcall target="javadoc" />
<antcall target="release" />
</target>
<target name="dist" depends="build,exe">
<copy todir="${DISTRIBUTIONDIR}">
<fileset dir="${RESOURCESDIR}" includes="**/*.*"/>
</copy>
</target>
<target name="build" depends="clean,compile">
<mkdir dir="${DISTRIBUTIONDIR}"/>
<delete dir="${DISTLIBRARIESFULLDIR}"/>
<mkdir dir="${DISTLIBRARIESFULLDIR}"/>
<copy todir="${DISTLIBRARIESFULLDIR}">
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
<fileset dir="${LIBRARIESDIR}" includes="**/*.exe"/>
</copy>
<tstamp>
<format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/>
</tstamp>
<exec executable="hg" outputproperty="MERCURIALTAG">
<arg value="id"/>
<arg value="-i"/>
</exec>
<propertyfile file="${COMPILEDIR}/${PROPERTIESNAME}"
comment="This file is automatically generated - DO NOT EDIT">
<entry key="buildtime" value="${BUILTAT}"/>
<entry key="build" value="${MERCURIALTAG}"/>
<entry key="builder" value="${BUILDER}"/>
<entry key="version" value="${VERSION}"/>
</propertyfile>
<pathconvert pathsep=" " property="manifestClassPath">
<fileset dir="${DISTRIBUTIONDIR}" includes="${DISTLIBRARIESDIRNAME}/**/*.*"/>
<chainedmapper>
<flattenmapper/>
<globmapper from="*" to="${DISTLIBRARIESDIRNAME}/*"/>
</chainedmapper>
</pathconvert>
<jar destfile="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" basedir="${COMPILEDIR}">
<manifest>
<attribute name="Main-Class" value="${MAINCLASS}"/>
<attribute name="Class-Path" value="${manifestClassPath}"/>
</manifest>
</jar>
</target>
<target name="run" depends="build">
<java jar="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" fork="true"/>
</target>
<target name="javadoc">
<mkdir dir="${JAVADOCDIR}"/>
<javadoc sourcepath="${SOURCEDIR}" destdir="${JAVADOCDIR}" windowtitle="${PROJECTNAME}"
useexternalfile="yes">
<fileset dir="${SOURCEDIR}" includes="**/*.java"/>
<classpath>
<fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
</classpath>
</javadoc>
</target>
<target name="clean">
<delete dir="${DISTRIBUTIONDIR}"/>
<delete dir="${COMPILETESTSDIR}"/>
<delete dir="${COMPILEDIR}"/>
<delete dir="${COVERAGEDIR}"/>
<delete dir="${TESTRESULTSDIR}"/>
</target>
</project>

53
trunk/installer.iss Normal file
View File

@@ -0,0 +1,53 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "JPEXS Free Flash Decompiler"
#include "installer.cfg"
#define MyAppPublisher "JPEXS"
#define MyAppURL "http://www.free-decompiler.com/flash/"
#define MyAppExeName "ffdec.exe"
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{E618D276-6596-41F4-8A98-447D442A77DB}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\FFDec
DefaultGroupName={#MyAppName}
AllowNoIcons=yes
LicenseFile=dist\license.txt
OutputDir=releases
OutputBaseFilename=ffdec_{#MyAppVersion}_setup
Compression=lzma
SolidCompression=yes
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "dist\ffdec.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "dist\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "dist\ffdec.bat"; DestDir: "{app}"; Flags: ignoreversion
Source: "dist\ffdec.jar"; DestDir: "{app}"; Flags: ignoreversion
Source: "dist\license.txt"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

32
trunk/src/com/jpexs/decompiler/flash/Main.java
View File

@@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
import java.io.*;
import java.net.Socket;
import java.util.Calendar;
import java.util.Properties;
import java.util.logging.ConsoleHandler;
import java.util.logging.FileHandler;
import java.util.logging.Level;
@@ -61,12 +62,14 @@ public class Main {
public static String file;
public static String maskURL;
public static SWF swf;
public static final String version = "1.5.0u1";
public static final String applicationName = "JPEXS Free Flash Decompiler v." + version;
public static String version = "";
public static final String applicationName = "JPEXS Free Flash Decompiler";
public static String applicationVerName;
public static final String shortApplicationName = "FFDec";
public static final String shortApplicationVerName = shortApplicationName + " v." + version;
public static String shortApplicationVerName;
public static final String projectPage = "http://www.free-decompiler.com/flash";
public static final String updatePage = "http://www.free-decompiler.com/flash/?update=" + version;
public static String updatePageStub = "http://www.free-decompiler.com/flash/?update=";
public static String updatePage;
public static final String vendor = "JPEXS";
public static LoadingDialog loadingDialog;
public static ModeFrame modeFrame;
@@ -76,6 +79,20 @@ public class Main {
private static boolean commandLineMode = false;
public static MainFrame mainFrame;
private static void loadProperties(){
Properties prop = new Properties();
try {
prop.load(Main.class.getResourceAsStream("/project.properties"));
version = prop.getProperty("version");
applicationVerName = applicationName + " v."+version;
updatePage = updatePageStub + version;
shortApplicationVerName = shortApplicationName + " v." + version;
} catch (IOException ex) {
//ignore
version = "unknown";
}
}
public static boolean isCommandLineMode() {
return commandLineMode;
}
@@ -396,8 +413,8 @@ public class Main {
}
public static void printHeader() {
System.out.println(applicationName);
for (int i = 0; i < applicationName.length(); i++) {
System.out.println(applicationVerName);
for (int i = 0; i < applicationVerName.length(); i++) {
System.out.print("-");
}
System.out.println();
@@ -449,7 +466,8 @@ public class Main {
* @param args the command line arguments
*/
public static void main(String[] args) throws IOException {
View.setLookAndFeel();
loadProperties();
View.setLookAndFeel();
Configuration.load();
int pos = 0;

2
trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java
View File

@@ -409,7 +409,7 @@ public class SWFOutputStream extends OutputStream {
/**
* Calculates number of bits needed for representing unsigned value
*
* @param v Unsigned value
* @param value Unsigned value
* @return Number of bits
*/
public static int getNeededBitsU(int value) {

8
trunk/src/com/jpexs/decompiler/flash/action/Action.java
View File

@@ -113,7 +113,7 @@ public class Action implements GraphSourceItem {
/**
* Returns address of this action
*
* @return
* @return address of this action
*/
public long getAddress() {
return address;
@@ -529,7 +529,7 @@ public class Action implements GraphSourceItem {
* @param constantPool Constant pool
* @param version SWF version
* @param hex Add hexadecimal
* @return
* @return String of P-code source
*/
public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
return toString();
@@ -537,11 +537,11 @@ public class Action implements GraphSourceItem {
/**
* Translates this function to stack and output.
*
* @param stack Stack
* @param constants Constant pool
* @param output Output
* @param regNames Register names
* @param variables Variables
* @param functions Functions
*/
public void translate(Stack<com.jpexs.decompiler.flash.graph.GraphTargetItem> stack, List<com.jpexs.decompiler.flash.graph.GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
}

5
trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.Main;
import static com.jpexs.decompiler.flash.Main.applicationVerName;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.abc.gui.ABCPanel;
@@ -224,7 +225,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi
Main.exit();
}
});
setTitle(Main.applicationName + (Main.DISPLAY_FILENAME ? " - " + Main.getFileTitle() : ""));
setTitle(Main.applicationVerName + (Main.DISPLAY_FILENAME ? " - " + Main.getFileTitle() : ""));
JMenuBar menuBar = new JMenuBar();
JMenu menuFile = new JMenu("File");
@@ -1020,7 +1021,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi
}
if (e.getActionCommand().equals("SAVEAS")) {
if (Main.saveFileDialog()) {
setTitle(Main.applicationName + (Main.DISPLAY_FILENAME ? " - " + Main.getFileTitle() : ""));
setTitle(Main.applicationVerName + (Main.DISPLAY_FILENAME ? " - " + Main.getFileTitle() : ""));
}
}
if (e.getActionCommand().equals("OPEN")) {

4
trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java
View File

@@ -584,8 +584,8 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD {
* The SECURITY_ATTRIBUTES structure contains the security descriptor for an
* object and specifies whether the handle retrieved by specifying this
* structure is inheritable. This structure provides security settings for
* objects created by various functions, such as {@link Kernel32#CreateFile},
* {@link Kernel32#CreatePipe}, or {@link Advapi32#RegCreateKeyEx}.
* objects created by various functions, such as Kernel32#CreateFile,
* Kernel32#CreatePipe, or Advapi32#RegCreateKeyEx.
*/
public static class SECURITY_ATTRIBUTES extends Structure {

4
trunk/src/com/jpexs/decompiler/flash/helpers/Highlighting.java
View File

@@ -113,7 +113,7 @@ public class Highlighting {
* Beggining of hilight of method
*
* @param index
* @return
* @return Hilighted method begin
*/
public static String hilighMethodBegin(long index) {
if (!doHighlight) {
@@ -125,7 +125,7 @@ public class Highlighting {
/**
* Ending of hilight of method
*
* @return
* @return Hilighted method end
*/
public static String hilighMethodEnd() {
if (!doHighlight) {

6
trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java
View File

@@ -30,10 +30,10 @@ public class SHAPE {
public List<SHAPERECORD> shapeRecords;
/**
* EXPERIMENTAL
* Converts shape to SVG
*
* @param shapeNum
* @return
* @param shapeNum Type of DefineShape
* @return String with XML representation of this shape (SVG)
*/
public String toSVG(int shapeNum) {
return SHAPERECORD.shapeToSVG(shapeNum, null, null, numFillBits, numLineBits, shapeRecords);

6
trunk/src/com/jpexs/decompiler/flash/types/SHAPEWITHSTYLE.java
View File

@@ -32,10 +32,10 @@ public class SHAPEWITHSTYLE {
public List<SHAPERECORD> shapeRecords;
/**
* EXPERIMENTAL
* Converts shape to SVG
*
* @param shapeNum
* @return
* @param shapeNum Type of DefineShape
* @return String with XML representation of this shape (SVG)
*/
public String toSVG(int shapeNum) {
return SHAPERECORD.shapeToSVG(shapeNum, fillStyles, lineStyles, numFillBits, numLineBits, shapeRecords);

BIN
trunk/testlib/junit-4.8.2.jar
View File

Binary file not shown.

BIN
trunk/testlib/testng-6.8.jar Normal file
View File

Binary file not shown.