rename AMF to Amf part3

This commit is contained in:
Jindra Petřík
2016-07-17 15:56:41 +02:00
parent 74642edfe9
commit 092bfb4acb
8 changed files with 16 additions and 16 deletions

View File

@@ -18,7 +18,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Amf3Tools_ {
public class Amf3Tools {
/**
* Converts AMF value to something human-readable.

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
import java.util.ArrayList;
import java.util.List;
import com.jpexs.decompiler.flash.amf.amf3.WithSubValues;
@@ -34,7 +34,7 @@ public abstract class AbstractVectorType<T> implements WithSubValues {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
}

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
import com.jpexs.decompiler.flash.amf.amf3.Pair;
import com.jpexs.helpers.Helper;
import java.util.ArrayList;
@@ -27,7 +27,7 @@ public class ArrayType implements WithSubValues {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
@Override

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
public class ByteArrayType {
@@ -16,7 +16,7 @@ public class ByteArrayType {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
}

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
import java.util.Date;
public class DateType {
@@ -21,7 +21,7 @@ public class DateType {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
public Date toDate() {

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
import com.jpexs.decompiler.flash.amf.amf3.Pair;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +32,7 @@ public class DictionaryType implements WithSubValues {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
public boolean hasWeakKeys() {

View File

@@ -1,6 +1,6 @@
package com.jpexs.decompiler.flash.amf.amf3.types;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools;
import com.jpexs.decompiler.flash.amf.amf3.Pair;
import com.jpexs.helpers.Helper;
import java.util.ArrayList;
@@ -94,7 +94,7 @@ public class ObjectType implements WithSubValues {
@Override
public String toString() {
return Amf3Tools_.amfToString(this);
return Amf3Tools.amfToString(this);
}
public void setSerializedData(byte[] serializedData) {

View File

@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
public class Amf3InputStreamTest {
private FileInputStream fis;
private AMF3InputStream is;
private Amf3InputStream is;
@AfterTest
public void deinitStream() {
@@ -45,7 +45,7 @@ public class Amf3InputStreamTest {
private void initStream(String fileName) throws FileNotFoundException {
fis = new FileInputStream("testdata/amf3/generated/" + fileName);
is = new AMF3InputStream(fis);
is = new Amf3InputStream(fis);
}
@Test
@@ -165,7 +165,7 @@ public class Amf3InputStreamTest {
@Test(expectedExceptions = UnsupportedValueType.class)
public void testUnsupportedMarker() throws IOException, NoSerializerExistsException {
final int UNSUPPORTED_MARKER = 100;
is = new AMF3InputStream(new ByteArrayInputStream(new byte[]{UNSUPPORTED_MARKER}));
is = new Amf3InputStream(new ByteArrayInputStream(new byte[]{UNSUPPORTED_MARKER}));
is.readValue();
}
}