Attachment 161598 Details for Bug 305001 – rough patch

[patch] rough patch

patchIOOBE.txt (text/plain), 4.25 KB, created by Ayushman Jain

on 2010-03-10 06:56:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2010-03-10 06:56:06 EST

Size: 4.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: dom/org/eclipse/jdt/core/dom/NodeFinder.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/NodeFinder.java,v
>retrieving revision 1.3
>diff -u -r1.3 NodeFinder.java
>--- dom/org/eclipse/jdt/core/dom/NodeFinder.java	5 Oct 2009 14:30:39 -0000	1.3
>+++ dom/org/eclipse/jdt/core/dom/NodeFinder.java	10 Mar 2010 11:52:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -149,8 +149,8 @@
> 			IBuffer buffer= source.getBuffer();
> 			if (buffer != null) {
> 				IScanner scanner= ToolFactory.createScanner(false, false, false, false);
>-				scanner.setSource(buffer.getText(start, length).toCharArray());
> 				try {
>+					scanner.setSource(buffer.getText(start, length).toCharArray());
> 					int token= scanner.getNextToken();
> 					if (token != ITerminalSymbols.TokenNameEOF) {
> 						int tStart= scanner.getCurrentTokenStartPosition();
>@@ -163,6 +163,8 @@
> 					}
> 				} catch (InvalidInputException e) {
> 					// ignore
>+				} catch (IndexOutOfBoundsException e) {
>+					return null;
> 				}
> 			}
> 		}
>Index: model/org/eclipse/jdt/core/IBuffer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IBuffer.java,v
>retrieving revision 1.23
>diff -u -r1.23 IBuffer.java
>--- model/org/eclipse/jdt/core/IBuffer.java	27 Jun 2008 16:04:01 -0000	1.23
>+++ model/org/eclipse/jdt/core/IBuffer.java	10 Mar 2010 11:52:35 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -156,8 +156,9 @@
>  * @param offset the  zero-based starting offset
>  * @param length the number of characters to retrieve
>  * @return the given range of text in this buffer
>+ * @exception IndexOutOfBoundsException
>  */
>-public String getText(int offset, int length);
>+public String getText(int offset, int length) throws IndexOutOfBoundsException;
> /**
>  * Returns the underlying resource for which this buffer was opened,
>  * or <code>null</code> if this buffer was not opened on a resource.
>Index: model/org/eclipse/jdt/internal/core/Member.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Member.java,v
>retrieving revision 1.52
>diff -u -r1.52 Member.java
>--- model/org/eclipse/jdt/internal/core/Member.java	7 Mar 2009 00:58:57 -0000	1.52
>+++ model/org/eclipse/jdt/internal/core/Member.java	10 Mar 2010 11:52:43 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -279,8 +279,8 @@
> 	final int length= range.getLength();
> 	if (length > 0 && buf.getChar(start) == '/') {
> 		IScanner scanner= ToolFactory.createScanner(true, false, false, false);
>-		scanner.setSource(buf.getText(start, length).toCharArray());
> 		try {
>+			scanner.setSource(buf.getText(start, length).toCharArray());
> 			int docOffset= -1;
> 			int docEnd= -1;
> 
>@@ -305,6 +305,8 @@
> 			}
> 		} catch (InvalidInputException ex) {
> 			// try if there is inherited Javadoc
>+		} catch (IndexOutOfBoundsException e) {
>+			return null;
> 		}
> 	}
> 	return null;

Flags:

Olivier_Thomann: iplog+

Actions: View | Diff

Attachments on bug 305001: 161598 | 162167