SAK-41858 - Change deleteWhitespace method by strip, as deleteWhitesp…

…ace also deletes newline characters. (sakaiproject#6981)
cab938 · Jun 4, 2019 · ea4d4e5 · ea4d4e5
1 parent 10a4326
commit ea4d4e5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java b/...org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
@@ -338,7 +338,7 @@ else if (time instanceof java.lang.Boolean) {
     		error=true;
     	}
     	boolean ipErr=false;
-    	String ipString = StringUtils.deleteWhitespace(assessmentSettings.getIpAddresses());
+    	String ipString = StringUtils.strip(assessmentSettings.getIpAddresses()," ");
     	String[]arraysIp=(ipString.split("\n"));
     	for(int a=0;a<arraysIp.length;a++){
     		String currentString=arraysIp[a];

diff --git a/.../src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java b/.../src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
@@ -319,7 +319,7 @@ public AssessmentFacade save(AssessmentSettingsBean assessmentSettings, boolean
     // k. set ipAddresses
 
     HashSet ipSet = new HashSet();
-    String ipAddresses = StringUtils.deleteWhitespace(assessmentSettings.getIpAddresses());
+    String ipAddresses = StringUtils.strip(assessmentSettings.getIpAddresses()," ");
     if (ipAddresses == null)
       ipAddresses = "";
 

diff --git a/...a/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java b/...a/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
@@ -164,7 +164,7 @@ public void processAction(ActionEvent ae) throws AbortProcessingException
         error=true;
     }
 
-    String ipString = StringUtils.deleteWhitespace(assessmentSettings.getIpAddresses());
+    String ipString = StringUtils.strip(assessmentSettings.getIpAddresses()," ");
      String[]arraysIp=(ipString.split("\n"));
      boolean ipErr=false;
      for(int a=0;a<arraysIp.length;a++){

diff --git a/...va/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java b/...va/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
@@ -156,7 +156,7 @@ public void processAction(ActionEvent ae) throws AbortProcessingException
 	    assessmentService.deleteAllSecuredIP(assessment);
 	    // k. set ipAddresses
 	    Set ipSet = new HashSet();
-	    String ipAddresses = StringUtils.deleteWhitespace(assessmentSettings.getIpAddresses());
+	    String ipAddresses = StringUtils.strip(assessmentSettings.getIpAddresses()," ");
 	    if (ipAddresses == null)
 	      ipAddresses = "";