Attachment 170561 Details for Bug 313972 – Fix

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

[patch] Fix

patch.txt (text/plain), 2.26 KB, created by Dani Megert

on 2010-05-31 12:39:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-05-31 12:39:56 EDT

Size: 2.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java,v
>retrieving revision 1.31
>diff -u -r1.31 DefaultJavaFoldingStructureProvider.java
>--- ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java	8 Jul 2009 12:34:22 -0000	1.31
>+++ ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java	31 May 2010 16:34:01 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2009 IBM Corporation and others.
>+ * Copyright (c) 2006, 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
>@@ -58,13 +58,13 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.JavaModelException;
>+import org.eclipse.jdt.core.SourceRange;
> import org.eclipse.jdt.core.ToolFactory;
> import org.eclipse.jdt.core.compiler.IProblem;
> import org.eclipse.jdt.core.compiler.IScanner;
> import org.eclipse.jdt.core.compiler.ITerminalSymbols;
> import org.eclipse.jdt.core.compiler.InvalidInputException;
> import org.eclipse.jdt.core.dom.CompilationUnit;
>-import org.eclipse.jdt.core.SourceRange;
> 
> import org.eclipse.jdt.ui.PreferenceConstants;
> 
>@@ -611,12 +611,13 @@
> 
> 			if (captionLine < lastLine) {
> 				int postOffset= document.getLineOffset(captionLine + 1);
>-				IRegion postRegion= new Region(postOffset, offset + length - postOffset);
>-
>-				if (preRegion == null)
>-					return new IRegion[] { postRegion };
>-
>-				return new IRegion[] { preRegion, postRegion };
>+				int postLength= offset + length - postOffset;
>+				if (postLength > 0) {
>+					IRegion postRegion= new Region(postOffset, postLength);
>+					if (preRegion == null)
>+						return new IRegion[] { postRegion };
>+					return new IRegion[] { preRegion, postRegion };
>+				}
> 			}
> 
> 			if (preRegion != null)

Actions: View | Diff

Attachments on bug 313972: 169554 | 169555 | 169607 | 169727 | 170561 | 170635