From 68564258a316e41cb014f98d2777b5944bf37de3 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sat, 7 Dec 2013 14:46:44 -0800 Subject: [PATCH] occured -> occurred --- baksmali/src/main/java/org/jf/baksmali/baksmali.java | 6 +++--- .../SpecialInstructionPaddingTest.smali | 4 ++-- util/src/main/java/org/jf/util/ClassFileNameHandler.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java index 8e90616f2..dc49640f3 100644 --- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java +++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java @@ -68,7 +68,7 @@ public static boolean disassembleDexFile(DexFile dexFile, final baksmaliOptions Iterables.concat(options.bootClassPathEntries, extraClassPathEntries), dexFile, options.apiLevel); } catch (Exception ex) { - System.err.println("\n\nError occured while loading boot class path files. Aborting."); + System.err.println("\n\nError occurred while loading boot class path files. Aborting."); ex.printStackTrace(System.err); return false; } @@ -217,7 +217,7 @@ private static boolean disassembleClass(ClassDef classDef, ClassFileNameHandler writer = new IndentingWriter(bufWriter); classDefinition.writeTo((IndentingWriter)writer); } catch (Exception ex) { - System.err.println("\n\nError occured while disassembling class " + classDescriptor.replace('/', '.') + " - skipping class"); + System.err.println("\n\nError occurred while disassembling class " + classDescriptor.replace('/', '.') + " - skipping class"); ex.printStackTrace(); // noinspection ResultOfMethodCallIgnored smaliFile.delete(); @@ -229,7 +229,7 @@ private static boolean disassembleClass(ClassDef classDef, ClassFileNameHandler try { writer.close(); } catch (Throwable ex) { - System.err.println("\n\nError occured while closing file " + smaliFile.toString()); + System.err.println("\n\nError occurred while closing file " + smaliFile.toString()); ex.printStackTrace(); } } diff --git a/smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali b/smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali index 49b4ae417..7e17dce05 100644 --- a/smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali +++ b/smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali @@ -12,7 +12,7 @@ .registers 2 .annotation runtime Lorg/junit/Test; .end annotation - + const v0, 0 invoke-static {}, LSpecialInstructionPaddingTest;->paddingTest()I move-result v0 @@ -120,7 +120,7 @@ :Label13 .end packed-switch - #this tests out an issue that occured where the prior packed switch data starts at a byte offset + #this tests out an issue that occurred where the prior packed switch data starts at a byte offset #that is 4 byte aligned but isn't 8 byte aligned, which caused the code to report the size of the #instruction to be 2 bytes more than it should be. # diff --git a/util/src/main/java/org/jf/util/ClassFileNameHandler.java b/util/src/main/java/org/jf/util/ClassFileNameHandler.java index 5619478c7..aede10e8c 100644 --- a/util/src/main/java/org/jf/util/ClassFileNameHandler.java +++ b/util/src/main/java/org/jf/util/ClassFileNameHandler.java @@ -142,7 +142,7 @@ private static boolean testForWindowsReservedFileNames(File path) { writer.close(); f.delete(); //doesn't throw IOException } catch (IOException ex) { - //if an exception occured, it's likely that we're on a windows system. + //if an exception occurred, it's likely that we're on a windows system. return true; } }