LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-30 01:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

russian translation, test fix

Browse Source
This commit is contained in:
Honfika
2014-02-25 19:17:09 +01:00
parent ad05cc4fc9
commit 4859d3b2d2
7 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
View File

@@ -438,3 +438,17 @@ node.others = \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u0435
#after version 1.8.1
menu.tools.search = \u041f\u043e\u0438\u0441\u043a \u0442\u0435\u043a\u0441\u0442\u0430
#after version 1.8.1u1
menu.tools.timeline = Timeline
dialog.selectcolor.title = \u0412\u044b\u0431\u043e\u0440 \u0446\u0432\u0435\u0442\u0430
button.selectcolor.hint = \u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u0434\u043b\u044f \u0432\u044b\u0431\u043e\u0440\u0430 \u0446\u0432\u0435\u0442\u0430
#default item name, will be used in following sentences
generictag.array.item = \u044d\u043b\u0435\u043c\u0435\u043d\u0442
generictag.array.insertbeginning = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u0432 \u043d\u0430\u0447\u0430\u043b\u043e
generictag.array.insertbefore = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u043f\u0435\u0440\u0435\u0434
generictag.array.remove = \u0423\u0434\u0430\u043b\u0438\u0442\u044c %item%
generictag.array.insertafter = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u043f\u043e\u0441\u043b\u0435
generictag.array.insertend = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u0432 \u043a\u043e\u043d\u0435\u0446

5
trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.graph.ExportMode;
@@ -60,10 +61,10 @@ public class ActionScript2AssemblerTest extends ActionStript2TestBase {
DoActionTag doa = getFirstActionTag();
doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String actualResult = writer.toString();
writer = new HilightedTextWriter(false);
writer = new HilightedTextWriter(new CodeFormatting(), false);
doa.getASMSource(swf.version, ExportMode.PCODE, writer, null);
String decompiled = writer.toString();

3
trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import java.io.BufferedInputStream;
@@ -77,7 +78,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase {
DoActionTag doa = getFirstActionTag();
doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String actualResult = writer.toString();

3
trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.flash.tags.ShowFrameTag;
@@ -48,7 +49,7 @@ public class ActionScript2Test extends ActionStript2TestBase {
private void compareSrc(int frame, String expectedResult) {
DoActionTag doa = getFrameSource(frame);
assertNotNull(doa);
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
try {
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
} catch (InterruptedException ex) {

5
trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.helpers.NulWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
@@ -71,7 +72,7 @@ public class ActionScript3Test {
HilightedTextWriter writer = null;
try {
abc.bodies[bodyIndex].convert(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits, true);
writer = new HilightedTextWriter(false);
writer = new HilightedTextWriter(new CodeFormatting(), false);
abc.bodies[bodyIndex].toString(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, writer, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
} catch (InterruptedException ex) {
fail();
@@ -892,7 +893,7 @@ public class ActionScript3Test {
int bodyIndex = abc.findMethodBodyByName(clsIndex, methodName);
assertTrue(methodInfo > -1);
assertTrue(bodyIndex > -1);
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
abc.method_info[methodInfo].getParamStr(writer, abc.constants, abc.bodies[bodyIndex], abc, new ArrayList<String>());
String actualResult = writer.toString().replaceAll("[ \r\n]", "");
String expectedResult = "p1:Event=null,p2:Number=1,p3:Number=-1,p4:Number=-1.1,p5:Number=-1.1,p6:String=\"a\"";

3
trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java
View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.generators;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
import com.jpexs.decompiler.flash.tags.DoActionTag;
@@ -53,7 +54,7 @@ public class AS2Generator {
if (doa == null) {
continue;
}
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String src = writer.toString();
if (src.trim().isEmpty()) {

3
trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
View File

@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.types.traits.Trait;
import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
import com.jpexs.decompiler.flash.tags.Tag;
@@ -62,7 +63,7 @@ public class AS3Generator {
s.append("(){\r\ndecompileMethod(\"");
s.append(name);
s.append("\", ");
HilightedTextWriter src = new HilightedTextWriter(false);
HilightedTextWriter src = new HilightedTextWriter(new CodeFormatting(), false);
abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", ExportMode.SOURCE, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, src, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
String[] srcs = src.toString().split("[\r\n]+");
for (int i = 0; i < srcs.length; i++) {