[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators ValidatorUniqueString.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators
In directory dev1:/tmp/cvs-serv26060/UI/org/eclipse/rse/ui/validators

Modified Files:
	ValidatorUniqueString.java 
Log Message:
[373326] When one of Duplicate Filter Names is deleted, both filters are deleted.


Index: ValidatorUniqueString.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ValidatorUniqueString.java	5 Jun 2007 11:36:54 -0000	1.10
--- ValidatorUniqueString.java	26 Mar 2012 20:37:00 -0000	1.11
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2002, 2007 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2002, 2012 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 16,19 ****
--- 16,20 ----
   * Kevin Doyle (IBM) - 174776: perform required sorting of Collection arguments
   * David Dykstal (IBM) - 174776: disallowed sorting of input arguments, used copies
+  * David McKnight (IBM)  [373326] When one of Duplicate Filter Names is deleted, both filters are deleted.
   *******************************************************************************/
  
***************
*** 298,303 ****
  		    return msg_NonUnique.getLevelOneText();		  
  		  */
! 	  	  if ((existingList!=null) && (Arrays.binarySearch(existingList,newText) >= 0))
! 		    currentMessage = msg_NonUnique;
  		  else if (syntaxValidator!=null) 
  		  {
--- 299,323 ----
  		    return msg_NonUnique.getLevelOneText();		  
  		  */
! 		  if (existingList != null){		  
! 			  if (!caseSensitive){
! 				  if (Arrays.binarySearch(existingList,newText) >= 0){	
! 					  currentMessage = msg_NonUnique;
! 				  }
! 			  }
! 			  else { // caseSensitive
! 				  boolean match = false;
! 				  for (int i = 0; i < existingList.length && !match; i++){
! 					  String existing = existingList[i];
! 					  if (existing != null){
! 						  match = newText.toLowerCase().equals(existing.toLowerCase());
! 					  }
! 				  }
! 				  if (match){
! 					  currentMessage = msg_NonUnique;
! 				  }
! 			  }
! 	  	  }
! 	  	 
! 	  	  
  		  else if (syntaxValidator!=null) 
  		  {