Update to develop and finally fixed the String class problem

Author: lhwlyd

.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="images"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>

…b260-18.ucsd.edu-null-null-en.properties …b260-26.ucsd.edu-null-null-en.properties?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-18.ucsd.edu-null-null-en.properties renamed to ?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-26.ucsd.edu-null-null-en.properties ?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-18.ucsd.edu-null-null-en.properties renamed to ?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-26.ucsd.edu-null-null-en.properties

@@ -1,5 +1,5 @@
 #JDK Font Configuration Generated File: *Do Not Edit*
-#Sat Apr 15 14:11:13 PDT 2017
+#Sat May 20 13:42:34 PDT 2017
 sansserif.0.27.family=Jomolhari
 sansserif.1.11.file=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf
 sansserif.2.11.family=Lohit Punjabi
@@ -593,7 +593,7 @@ serif.0.26.file=/usr/share/fonts/un-core/UnDotum.ttf
 serif.2.10.file=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf
 sansserif.3.30.file=/usr/share/fonts/tibetan-machine-uni/TibMachUni-1.901b.ttf
 sansserif.3.5.family=Waree
-cachedir.1=/home/linux/ieng6/cs30x/cs30xsd/.fontconfig
+cachedir.1=/home/linux/ieng6/cs30x/cs30xjk/.fontconfig
 monospaced.3.34.family=Jomolhari
 cachedir.0=/var/cache/fontconfig
 monospaced.2.25.family=PakTypeNaqsh

images/arrow.png

@@ -42,16 +42,20 @@ public void performAction() {
 				getSelectedComponents().get(0);
 		Method[] methods = insComp.getDisplayingClass().getMethods();
 
-		int desiaredConstructorIndex = Integer
-				.parseInt(JOptionPane.showInputDialog(
+		String desiaredConstructorIndex = JOptionPane.showInputDialog(
 						"Please enter the index of the constructor you would like to use: \n\n\n"
-								+ getMethodsSelectionUI(methods)));
-		AddInstanceMethodGlobalAction assiciatedAction = 
-				(AddInstanceMethodGlobalAction) ActionName.ADD_INSTANCE_METHOD_ACTION
-				.getAssiciatedAction();
-		assiciatedAction.setInsComp(insComp);
-		assiciatedAction.setMethodToSet(methods[desiaredConstructorIndex]);
-		GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
+								+ getMethodsSelectionUI(methods));
+		
+		//call DialogInputChecker to check input
+		DialogInputChecker inputChecker = new DialogInputChecker();
+		if(inputChecker.isValidNumber(desiaredConstructorIndex, 0, methods.length -1)){
+			AddInstanceMethodGlobalAction assiciatedAction = 
+					(AddInstanceMethodGlobalAction) ActionName.ADD_INSTANCE_METHOD_ACTION
+					.getAssiciatedAction();
+			assiciatedAction.setInsComp(insComp);
+			assiciatedAction.setMethodToSet(methods[Integer.parseInt(desiaredConstructorIndex)]);
+			GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
+		}
 	}
 
 	@Override

images/arrowselected.png

@@ -37,16 +37,18 @@ public void performAction() {
 				.getSelectedComponents().get(0);
 		Constructor[] cons = comp.getDisplayingClass().getConstructors();
 
-		int desiaredConstructorIndex = Integer
-				.parseInt(JOptionPane.showInputDialog(
+		String desiaredConstructorIndex = JOptionPane.showInputDialog(
 						"Please enter the index of the constructor you would like to use: \n\n\n"
-								+ getConstructorsSelectionUI(cons)));
-		
-		AddInstanceOperationGlobalAction assiciatedAction = 
-				(AddInstanceOperationGlobalAction) ActionName.ADD_INSTANCE_OPERATION_ACTION
-				.getAssiciatedAction();
-		assiciatedAction.setConstructorToSet(cons[desiaredConstructorIndex]);
-		GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
+								+ getConstructorsSelectionUI(cons));
+		//call inputChecker to check if input is valid
+		DialogInputChecker inputChecker = new DialogInputChecker();
+		if(inputChecker.isValidNumber(desiaredConstructorIndex, 0, cons.length -1)){
+			AddInstanceOperationGlobalAction assiciatedAction = 
+					(AddInstanceOperationGlobalAction) ActionName.ADD_INSTANCE_OPERATION_ACTION
+					.getAssiciatedAction();
+			assiciatedAction.setConstructorToSet(cons[Integer.parseInt(desiaredConstructorIndex)]);
+			GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
+		}
 
 	}