Attachment 198457 Details for Bug 350121 – same patch but with fixed up copyrights

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] same patch but with fixed up copyrights

fix-warnings.patch (text/plain), 6.06 KB, created by Gary Karasiuk

on 2011-06-23 05:27:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Karasiuk

Created: 2011-06-23 05:27:34 EDT

Size: 6.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.validation
>Index: validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java,v
>retrieving revision 1.41
>diff -u -r1.41 ValidatorMetaData.java
>--- validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java	19 May 2010 21:32:03 -0000	1.41
>+++ validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java	23 Jun 2011 09:26:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2010 IBM Corporation and others.
>+ * Copyright (c) 2001, 2011 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
>  * which accompanies this distribution, and is available at
>@@ -350,8 +350,8 @@
> 	                    if(outputContainers[i].equals(sourceContainers[j])){
> 	                    	return true;
> 	                    }
>-						return false;
> 					}
>+					return false;
> 				}
> 			}
> 		}
>Index: validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java,v
>retrieving revision 1.19
>diff -u -r1.19 ValidatorTypeFilter.java
>--- validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java	22 Apr 2008 22:58:55 -0000	1.19
>+++ validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java	23 Jun 2011 09:26:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2008 IBM Corporation and others.
>+ * Copyright (c) 2001, 2011 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
>  * which accompanies this distribution, and is available at
>@@ -73,16 +73,13 @@
> 		// doesn't implement A, then the isInstance call will return false.
> 		//
> 		// So, instead of using Class.isInstance, do the checking myself.
>+		final String filterClassName = filterClass.getName();
> 		for (Class cl = objectClass; cl != null; cl = cl.getSuperclass()) {
>-			if (cl.getName().equals(filterClass.getName())) {
>-				return true;
>-			}
>+			if (cl.getName().equals(filterClassName))return true;
> 			Class[] clInterfaces = cl.getInterfaces();
> 			for (int i = 0; i < clInterfaces.length; i++) {
>-				if (clInterfaces[i].getName().equals(filterClass.getName())) {
>-					return true;
>-				}
>-				return isInstance(clInterfaces[i], filterClass);
>+				if (clInterfaces[i].getName().equals(filterClassName))return true;
>+				if (isInstance(clInterfaces[i], filterClass))return true;
> 			}
> 		}
> 		return false;
>Index: vf2/org/eclipse/wst/validation/internal/ValManager.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java,v
>retrieving revision 1.47.2.1
>diff -u -r1.47.2.1 ValManager.java
>--- vf2/org/eclipse/wst/validation/internal/ValManager.java	21 Mar 2011 20:22:13 -0000	1.47.2.1
>+++ vf2/org/eclipse/wst/validation/internal/ValManager.java	23 Jun 2011 09:26:48 -0000
>@@ -1039,7 +1039,6 @@
> 		 * Map validator id's to Integers. The integers correspond to bits in the ValProperty instances.
> 		 */
> 		private final Map<String, Integer> _map = new HashMap<String, Integer>(100);
>-		private final Map<Integer, String> _reverseMap = new HashMap<Integer, String>(100);
> 		
> 		/** Next available bit. */
> 		private int _next;
>@@ -1055,39 +1054,9 @@
> 			
> 			i = _next++;
> 			_map.put(id, i);
>-			_reverseMap.put(i, id);
> 			
> 			return i;
>-		}
>-		
>-		/**
>-		 * Answer the validator id for the index.
>-		 * @param index
>-		 * @return null if the index number has not been set.
>-		 */
>-		public synchronized String getId(Integer index){
>-			return _reverseMap.get(index);
>-		}
>-		
>-		public synchronized void reset(){
>-			_map.clear();
>-			_reverseMap.clear();
>-			_next = 0;
>-		}
>-		
>-		/**
>-		 * Answer the ids for the bit in the bitset. This is used for debugging. 
>-		 * @param bs
>-		 */
>-		public synchronized String[] getIds(BitSet bs){
>-			List<String> list = new LinkedList<String>();
>-			for(int i=bs.nextSetBit(0); i>=0; i=bs.nextSetBit(i+1)) {
>-				String id = getId(i);
>-				if (id != null)list.add(id);
>-			}
>-			String[] s = new String[list.size()];
>-			return list.toArray(s);
>-		}		
>+		}				
> 	}
> 	
> 	/**
>Index: vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java,v
>retrieving revision 1.20
>diff -u -r1.20 FilterRule.java
>--- vf2/org/eclipse/wst/validation/internal/model/FilterRule.java	27 Jan 2009 10:16:58 -0000	1.20
>+++ vf2/org/eclipse/wst/validation/internal/model/FilterRule.java	23 Jun 2011 09:26:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2009 IBM Corporation and others.
>+ * Copyright (c) 2007, 2011 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
>  * which accompanies this distribution, and is available at
>@@ -512,7 +512,6 @@
> 		@Override
> 		public Boolean matchesResource(IResource resource, ContentTypeWrapper wrapper) {
> 			String name = PortableFileDelim + resource.getProjectRelativePath().toPortableString();
>-			if (name == null)return Boolean.FALSE;
> 			return _compiledPattern.matcher(name).matches();
> 		}		
> 	}

Actions: View | Diff

Attachments on bug 350121: 198456 | 198457 | 198616