Merge pull request soot-oss#14 from bergerbd/master

Fixed a syntactic error in soot_options.xml
StevenArzt · Dec 5, 2012 · 3e22f89 · 3e22f89
2 parents 0740ce0 + 7f4fcf2
commit 3e22f89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java b/eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java
@@ -10374,7 +10374,7 @@ private Composite Input_OptionsCreate(Composite parent) {
 
 		}
 
-		setInput_Optionsforce_android_jar_widget(new StringOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Force specific Android jar file",  "", "","force-android-jar", "\nUse PATH as the path to the android.jar file Soot should use. \nThis option overrides the "android-jars" option. 			", defaultString)));
+		setInput_Optionsforce_android_jar_widget(new StringOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Force specific Android jar file",  "", "","force-android-jar", "\nUse PATH as the path to the android.jar file Soot should use. \nThis option overrides the 'android-jars' option. 			", defaultString)));
 
 
 		defKey = ""+" "+""+" "+"main-class";

diff --git a/src/soot/options/soot_options.xml b/src/soot/options/soot_options.xml
@@ -345,7 +345,7 @@ The Android application must contain the AndroidManifest.xml file.
 			<short_desc>Force Soot to use <use_arg_label/> as the path for the android.jar file.</short_desc>
 			<long_desc>
 Use <use_arg_label/> as the path to the android.jar file Soot should use.
-This option overrides the "android-jars" option.
+This option overrides the 'android-jars' option.
 			</long_desc>
 		</stropt>
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
-    		setInput_Optionsforce_android_jar_widget(new StringOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Force specific Android jar file",  "", "","force-android-jar", "\nUse PATH as the path to the android.jar file Soot should use. \nThis option overrides the "android-jars" option. 			", defaultString)));
+    		setInput_Optionsforce_android_jar_widget(new StringOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Force specific Android jar file",  "", "","force-android-jar", "\nUse PATH as the path to the android.jar file Soot should use. \nThis option overrides the 'android-jars' option. 			", defaultString)));
     		defKey = ""+" "+""+" "+"main-class";
@@ Expand Down @@