Skip to content

Commit 441d045

Browse files
ThexXTURBOXxpxb1988
ThexXTURBOXx
authored and
pxb1988
committed
Fix grammar & typo
1 parent 121f727 commit 441d045

File tree

15 files changed

+22
-21
lines changed

15 files changed

+22
-21
lines changed

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jar2JasminCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void doCommandLine() throws Exception {
5252

5353
Path jar = new File(remainingArgs[0]).toPath().toAbsolutePath();
5454
if (!Files.exists(jar)) {
55-
System.err.println(jar + " is not exists");
55+
System.err.println(jar + " doesn't exist");
5656
usage();
5757
return;
5858
}

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jasmin2JarCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected void doCommandLine() throws Exception {
7171

7272
Path jar = new File(remainingArgs[0]).toPath().toAbsolutePath();
7373
if (!Files.exists(jar)) {
74-
System.err.println(jar + " is not exists");
74+
System.err.println(jar + " doesn't exist");
7575
usage();
7676
return;
7777
}

‎d2j-smali/src/main/java/com/googlecode/d2j/smali/BaksmaliCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void doCommandLine() throws Exception {
3636

3737
File dex = new File(remainingArgs[0]);
3838
if (!dex.exists()) {
39-
System.err.println("ERROR: " + dex + " is not exists");
39+
System.err.println("ERROR: " + dex + " doesn't exist");
4040
return;
4141
}
4242
if (output == null) {

‎dex-ir/src/main/java/com/googlecode/dex2jar/ir/TypeClass.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static TypeClass merge(TypeClass thizCls, TypeClass clz) {
101101
if ((thizCls == INT && clz == BOOLEAN) || (thizCls == BOOLEAN || clz == INT)) {
102102
return INT;
103103
}
104-
throw new RuntimeException("can not merge " + thizCls + " and " + clz);
104+
throw new RuntimeException("Can't merge " + thizCls + " and " + clz);
105105
} else {
106106
return thizCls;
107107
}
@@ -123,7 +123,7 @@ public static TypeClass merge(TypeClass thizCls, TypeClass clz) {
123123
*/
124124
private static TypeClass merge0(TypeClass a, TypeClass b) {
125125
if (a == JD || b == JD) {
126-
throw new RuntimeException("can not merge " + a + " and " + b);
126+
throw new RuntimeException("Can't merge " + a + " and " + b);
127127
}
128128
switch (a) {
129129
case ZIL:

‎dex-reader/src/main/java/com/googlecode/d2j/reader/DexFileReader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public DexFileReader(InputStream is) throws IOException {
281281
}
282282

283283
/**
284-
* Reads a string index. String indicies are offset by 1, and a 0 value in the stream (-1 as returned by this
284+
* Reads a string index. String indices are offset by 1, and a 0 value in the stream (-1 as returned by this
285285
* method) means "null"
286286
*
287287
* @return index into file's string ids table, -1 means null
@@ -1095,7 +1095,7 @@ private void read_annotation_set_ref_list(int parameter_annotation_offset, DexMe
10951095
read_annotation_set_item(param_annotation_offset, dpav);
10961096
}
10971097
} catch (Exception e) {
1098-
throw new DexException(e, "while accept parameter annotation in parameter:[%d]", j);
1098+
throw new DexException(e, "While accepting parameter annotation in parameter: [%d]", j);
10991099
}
11001100
}
11011101
}

‎dex-reader/src/main/java/com/googlecode/d2j/reader/MultiDexFileReader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static BaseDexFileReader open(byte[] data) throws IOException {
5555
return new MultiDexFileReader(dexFileReaders.values());
5656
}
5757
}
58-
throw new IOException("the src file not a .dex or zip file");
58+
throw new IOException("The source file is not a .dex or .zip file");
5959
}
6060

6161
void init() {

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/ApkSign.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected void doCommandLine() throws Exception {
5454

5555
Path apkIn = new File(remainingArgs[0]).toPath();
5656
if (!Files.exists(apkIn)) {
57-
System.err.println(apkIn + " is not exists");
57+
System.err.println(apkIn + " doesn't exist");
5858
usage();
5959
return;
6060
}

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/AsmVerify.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void doCommandLine() throws Exception {
118118
for (String fn : remainingArgs) {
119119
Path file = new File(fn).toPath();
120120
if (!Files.exists(file)) {
121-
System.err.println(fn + " is not exists");
121+
System.err.println(fn + " doesn't exist");
122122
usage();
123123
return;
124124
}

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/DeObfInitCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected void doCommandLine() throws Exception {
4949

5050
Path jar = new File(remainingArgs[0]).toPath();
5151
if (!Files.exists(jar)) {
52-
System.err.println(jar + " is not exists");
52+
System.err.println(jar + " doesn't exist");
5353
usage();
5454
return;
5555
}

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/DecryptStringCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected void doCommandLine() throws Exception {
162162

163163
final Path jar = new File(remainingArgs[0]).toPath();
164164
if (!Files.exists(jar)) {
165-
System.err.println(jar + " is not exists");
165+
System.err.println(jar + " doesn't exist");
166166
return;
167167
}
168168
if (output == null) {

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/DexRecomputeChecksum.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void doCommandLine() throws Exception {
4444

4545
Path jar = new File(remainingArgs[0]).toPath();
4646
if (!Files.exists(jar)) {
47-
System.err.println(jar + " is not exists");
47+
System.err.println(jar + " doesn't exist");
4848
usage();
4949
return;
5050
}

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/GenerateCompileStubFromOdex.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
import java.nio.file.Files;
1515
import java.nio.file.Path;
1616

17-
@BaseCmd.Syntax(cmd = "d2j-generate-stub-from-odex", syntax = "[options] <odex0> [odex1 ... odexN]", desc = "Genenerate no-code jar from odex")
17+
@BaseCmd.Syntax(cmd = "d2j-generate-stub-from-odex", syntax = "[options] <odex0> [odex1 ... odexN]", desc =
18+
"Generate no-code jar from odex")
1819
public class GenerateCompileStubFromOdex extends BaseCmd {
1920
private static final int MAGIC_ODEX = 0x0A796564 & 0x00FFFFFF;// hex for 'dey ', ignore the 0A
2021
private static final int MAGIC_DEX = 0x0A786564 & 0x00FFFFFF;// hex for 'dex ', ignore the 0A
@@ -31,7 +32,7 @@ public static void main(String... args) {
3132
@Override
3233
protected void doCommandLine() throws Exception {
3334
if (remainingArgs.length == 0) {
34-
throw new HelpException("no odex");
35+
throw new HelpException("No odex");
3536
}
3637
if (output == null) {
3738
output = new File("stub.jar").toPath();
@@ -40,7 +41,7 @@ protected void doCommandLine() throws Exception {
4041
try (FileSystem fs = createZip(output)) {
4142
Path out = fs.getPath("/");
4243
for (String x : remainingArgs) {
43-
System.err.println("process " + x + " ...");
44+
System.err.println("Processing " + x + " ...");
4445
ByteBuffer bs = ByteBuffer.wrap(Files.readAllBytes(new File(x).toPath()))
4546
.order(ByteOrder.LITTLE_ENDIAN);
4647
int magic = bs.getInt(0) & 0x00FFFFFF;
@@ -53,7 +54,7 @@ protected void doCommandLine() throws Exception {
5354
} else if (magic == MAGIC_DEX) {
5455
doDex(bs, out);
5556
} else {
56-
throw new RuntimeException("file " + x + " is not an dex or odex");
57+
throw new RuntimeException("File " + x + " is not an dex or odex");
5758
}
5859

5960
}
@@ -70,7 +71,7 @@ private void doDex(ByteBuffer bs, final Path out) {
7071
public ClassVisitor create(final String classInternalName) {
7172
final Path target = out.resolve(classInternalName + ".class");
7273
if (Files.exists(target)) {
73-
System.err.println("class " + classInternalName + " is already exists, skipping.");
74+
System.err.println("Class " + classInternalName + " already exists, skipping.");
7475
return null;
7576
}
7677
return new ClassVisitor(Opcodes.ASM4, new ClassWriter(ClassWriter.COMPUTE_MAXS)) {

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/JarAccessCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected void doCommandLine() throws Exception {
126126

127127
Path jar = new File(remainingArgs[0]).toPath();
128128
if (!Files.exists(jar)) {
129-
System.err.println(jar + " is not exists");
129+
System.err.println(jar + " doesn't exist");
130130
usage();
131131
return;
132132
}

‎dex-translator/src/main/java/com/googlecode/d2j/dex/ExDex2Asm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void convertCode(DexMethodNode methodNode, MethodVisitor mv, ClzCtx clzCt
4040
super.convertCode(methodNode, mn, clzCtx);
4141
} catch (Exception ex) {
4242
if (exceptionHandler == null) {
43-
throw new DexException(ex, "fail convert code for %s", methodNode.method);
43+
throw new DexException(ex, "Failed to convert code for %s", methodNode.method);
4444
} else {
4545
mn.instructions.clear();
4646
mn.tryCatchBlocks.clear();

‎dex-translator/src/test/java/com/googlecode/dex2jar/test/TestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public void convertCode(DexMethodNode methodNode, MethodVisitor mv, ClzCtx clzCt
308308
} catch (IOException e) {
309309
e.printStackTrace();
310310
}
311-
throw new DexException(ex, "fail convert code %s", methodNode.method);
311+
throw new DexException(ex, "Failed to convert code for %s", methodNode.method);
312312
}
313313
}
314314
};

0 commit comments

Comments
 (0)