Attachment 39652 Details for Bug 138874 – Fix to enable the quick assist/clean up

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

[patch] Fix to enable the quick assist/clean up

enable_138874.txt (text/plain), 3.25 KB, created by Benno Baumgartner

on 2006-04-27 06:04:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2006-04-27 06:04:36 EDT

Size: 3.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui.tests
>Index: ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java,v
>retrieving revision 1.45
>diff -u -r1.45 CleanUpTest.java
>--- ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java	27 Apr 2006 09:44:25 -0000	1.45
>+++ ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java	27 Apr 2006 09:51:06 -0000
>@@ -4340,14 +4340,22 @@
> 		buf.append("package test1;\n");
> 		buf.append("public class E {\n");
> 		buf.append("    public void foo() {\n");
>-		buf.append("        if (true) {\n");
>+		buf.append("        if (true) { \n");
> 		buf.append("            if (true)\n");
> 		buf.append("                ;\n");
> 		buf.append("        } else if (true) {\n");
> 		buf.append("            if (false) {\n");
> 		buf.append("                ;\n");
>+		buf.append("            } else if (true) {\n");
>+		buf.append("                ;\n");
> 		buf.append("            } else\n");
> 		buf.append("                ;\n");
>+		buf.append("        } else if (true) {\n");
>+		buf.append("            if (false) {\n");
>+		buf.append("                ;\n");
>+		buf.append("            } else if (true) {\n");
>+		buf.append("                ;\n");
>+		buf.append("            }\n");
> 		buf.append("        } else if (false) {\n");
> 		buf.append("            if (true) {\n");
> 		buf.append("                ;\n");
>@@ -4373,11 +4381,18 @@
> 		buf.append("        if (true) {\n");
> 		buf.append("            if (true)\n");
> 		buf.append("                ;\n");
>-		buf.append("        } else if (true) {\n");
>+		buf.append("        } else if (true)\n");
> 		buf.append("            if (false)\n");
> 		buf.append("                ;\n");
>+		buf.append("            else if (true)\n");
>+		buf.append("                ;\n");
> 		buf.append("            else\n");
> 		buf.append("                ;\n");
>+		buf.append("        else if (true) {\n");
>+		buf.append("            if (false)\n");
>+		buf.append("                ;\n");
>+		buf.append("            else if (true)\n");
>+		buf.append("                ;\n");
> 		buf.append("        } else if (false) {\n");
> 		buf.append("            if (true)\n");
> 		buf.append("                ;\n");
>#P org.eclipse.jdt.ui
>Index: core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java,v
>retrieving revision 1.9
>diff -u -r1.9 ControlStatementsFix.java
>--- core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java	27 Apr 2006 09:44:43 -0000	1.9
>+++ core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java	27 Apr 2006 09:51:07 -0000
>@@ -437,6 +437,13 @@
> 		if (!(thenStatement instanceof IfStatement))
> 			return true;
> 
>+		IfStatement childIf= (IfStatement)thenStatement;
>+		while (childIf.getElseStatement() instanceof IfStatement)
>+			childIf= (IfStatement)childIf.getElseStatement();
>+		
>+		if (childIf.getElseStatement() != null)
>+			return true;
>+		
> 		return false;
> 	}
>

Actions: View | Diff

Attachments on bug 138874: 39652