diff options
56 files changed, 73 insertions, 56 deletions
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll62_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll62_out.java index 6d57345795..23a82e9e6d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll62_out.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll62_out.java @@ -1,6 +1,5 @@ package p; - class A { void m(long/*64*/x/*xxx*/, long /*64*/y /*xxx*/, long/*64*/ z/*xxx*/) { } } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java index 6bb544fb3e..8ac8a8f687 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java @@ -1,6 +1,5 @@ package org.eclipse.p; - class A { /** * @throws Exception diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java index 46edd3c734..6b590c23af 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java @@ -1,6 +1,5 @@ package p; - class A { void m() { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractClass/testImportRemove/out/ImportRemove.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractClass/testImportRemove/out/ImportRemove.java index 8a266bb39e..915d378ffc 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractClass/testImportRemove/out/ImportRemove.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractClass/testImportRemove/out/ImportRemove.java @@ -10,7 +10,6 @@ *******************************************************************************/ package p; - public class ImportRemove { private ImportRemoveParameter parameterObject = new ImportRemoveParameter(); }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-clone-not-raw-src.zip b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-clone-not-raw-src.zip Binary files differindex 95f76e572d..36280abbd1 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-clone-not-raw-src.zip +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-clone-not-raw-src.zip diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-generified-src.zip b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-generified-src.zip Binary files differindex 03d2c9c388..da082d5707 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-generified-src.zip +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/junit381-noUI-generified-src.zip diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java index 4e4a781472..7c10b1b954 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java @@ -1,5 +1,7 @@ package p; +import p.A.Z; + public class A { static void takeP(Class c) {} static void takePQ(Class c) {} diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java index 3eb15bfc14..e460da2f2c 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java @@ -4,6 +4,7 @@ package p; import static p.A.getCount2; import static q.Consts.I; import static r.Third.B; + import r.Third; public class A { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java index 3736dc8483..4eac53acd5 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java @@ -1,6 +1,5 @@ package q; - public interface Consts { int I= 1; }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java index 0d7c0a7e8b..c412924de2 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java @@ -3,6 +3,7 @@ package p; import static p.A.getCount2; import static q.Consts.I; + import q.Consts; public class A { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java index 3736dc8483..4eac53acd5 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java @@ -1,6 +1,5 @@ package q; - public interface Consts { int I= 1; }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java index f6ef9fb04d..8b7d8d5d86 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java @@ -1,5 +1,4 @@ package p; - class A { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java index 08977441be..80ec67b44a 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java @@ -1,6 +1,5 @@ package p; - class C { String fS= ""; } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java index 9b9ad0a0fb..79b5682683 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java @@ -1,6 +1,5 @@ package p2; - class D { void f() { int j= 12345; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java index 74ccf93edc..4aea0b493d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java @@ -1,7 +1,6 @@ // 8, 18 -> 8, 26 replaceAll == true, removeDeclaration == true package p2; - class D { void f() { int j= 12345; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java index 282fbc6ef4..da62cbb1bd 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java @@ -1,6 +1,5 @@ package p3; - public class E { static int e= 1 + 12345; }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_fieldWithImportMoveAcross/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_fieldWithImportMoveAcross/out/A.java index c75c639dde..d5a762849c 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_fieldWithImportMoveAcross/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_fieldWithImportMoveAcross/out/A.java @@ -1,3 +1,4 @@ package p; + public class A { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java index 5d6c4ced79..0c1b22cb45 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java @@ -1,7 +1,7 @@ package p1; -import p.Inner; import p.A.*; +import p.Inner; class A1{ p.Inner a; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java index 1383882f24..23fae3e676 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java @@ -1,5 +1,4 @@ package p; - class A { }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/A.java index 189e6f8889..40c806c638 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/A.java @@ -1,4 +1,5 @@ package p; + public class A { static void foo(){}; static int fred; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/Inner.java index 33dbe27cf3..282ab988d8 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/Inner.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_41/out/Inner.java @@ -1,6 +1,7 @@ package p; import static java.lang.Math.E; + import p.A.Stat; class Inner { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_secondary_8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_secondary_8/out/A.java index 6b3def5486..e4848154da 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_secondary_8/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_secondary_8/out/A.java @@ -1,6 +1,5 @@ package p; - public class A { class B { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java index 88d52c5897..3c9b608b8a 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java @@ -1,7 +1,6 @@ // Move mA1 to parameter b, inline delegator, remove delegator package p1; - public class A { public void mA2() {} diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test26/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test26/out/TR.java index c9954fdee7..aaf17570f2 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test26/out/TR.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test26/out/TR.java @@ -1,4 +1,5 @@ package p1; + public class TR { /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test27/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test27/out/TR.java index a9874eaeb4..0be647b020 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test27/out/TR.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test27/out/TR.java @@ -1,4 +1,5 @@ package p1; + public class TR { /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test28/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test28/out/TR.java index a9874eaeb4..0be647b020 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test28/out/TR.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test28/out/TR.java @@ -1,4 +1,5 @@ package p1; + public class TR { /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test29/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test29/out/TR.java index 47e5ad3b37..8d32652701 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test29/out/TR.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test29/out/TR.java @@ -1,4 +1,5 @@ package p1; + public enum TR implements P { PASSED, FAILED; /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test30/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test30/out/TR.java index 47e5ad3b37..8d32652701 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test30/out/TR.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test30/out/TR.java @@ -1,4 +1,5 @@ package p1; + public enum TR implements P { PASSED, FAILED; /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test42/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test42/out/A.java index a94d76c872..d5a762849c 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test42/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test42/out/A.java @@ -1,5 +1,4 @@ package p; - public class A { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test46/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test46/out/A.java index a94d76c872..d5a762849c 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test46/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test46/out/A.java @@ -1,5 +1,4 @@ package p; - public class A { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test58/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test58/out/A.java index 63688b10b3..149bb9099f 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test58/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test58/out/A.java @@ -1,5 +1,4 @@ package p; - public class A { }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test59/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test59/out/A.java index a0837899f6..9b72dbf032 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test59/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test59/out/A.java @@ -1,4 +1,5 @@ package p; + public class A { class X { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/A.java index 2bfaa6d572..099d2b9f35 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/A.java @@ -1,6 +1,5 @@ package p; - public class A { public static class X { public static void n() {} diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/B.java index d04a1df528..3ac350c21b 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test62/out/B.java @@ -1,6 +1,7 @@ package q; import static java.util.Arrays.asList; + import p.A; public class B { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java index 6d7cf6012b..52c6073853 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java @@ -1,5 +1,4 @@ package p; - public class A{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate03/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate03/out/A.java index bb8ff2b4af..30101ff15b 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate03/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate03/out/A.java @@ -1,6 +1,5 @@ package p; - public class A { /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate07/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate07/out/A.java index 47427151b5..c67e0c4561 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate07/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testDelegate07/out/A.java @@ -1,6 +1,5 @@ package p; - public class A { /** diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java index a374d0c3eb..882d686310 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java @@ -1,4 +1,5 @@ package p2; + public class A{ C c; p2.C p2c; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java index ed83a58955..45208b82ad 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java @@ -1,4 +1,5 @@ package p2; + public class B{ C c; p2.C m(C C, A A){ diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java index a374d0c3eb..882d686310 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java @@ -1,4 +1,5 @@ package p2; + public class A{ C c; p2.C p2c; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java index 161572ef79..5cdc1420d4 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java @@ -1,4 +1,5 @@ package p2; + public class B{ C c; p2.C m(C C, p2.A A){ diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java index 8bc59c93f1..a007291b36 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java @@ -1,3 +1,4 @@ package p; + class B extends A{ } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java index 6ba1e8dc5d..f6e6d24598 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java @@ -1,3 +1,4 @@ package p; + class B extends A{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java index 595066ca3c..b83a7923da 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java @@ -1,3 +1,4 @@ package p; + class B<T> extends A<T>{ } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports0/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports0/out/B.java index 15b4326f8b..ca8b6bd489 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports0/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports0/out/B.java @@ -1,3 +1,4 @@ package p; + class B<S> extends A<S>{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports1/out/B.java index 15b4326f8b..ca8b6bd489 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports1/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testStaticImports1/out/B.java @@ -1,3 +1,4 @@ package p; + class B<S> extends A<S>{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java index e7378d5381..e88edb93fb 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java @@ -1,5 +1,4 @@ package p; - abstract class A{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test33/out/A.java index e7378d5381..e88edb93fb 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test33/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test33/out/A.java @@ -1,5 +1,4 @@ package p; - abstract class A{ }
\ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java index b3c8964950..c2ea9e0e8a 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java @@ -1,5 +1,6 @@ package tests; +/* q - textual ref */ import p.p.ATest; import q.*; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java index 531110fcf0..b70f1e4f8f 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java @@ -1,5 +1,6 @@ package tests; +//danger! import p.p.ATest; import q.*; diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java index f2759d3f65..3ee50e4401 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java @@ -1,8 +1,10 @@ package tests; +import static q.A.*; + +/* p.p - textual ref */ import p.p.ATest; import q.*; -import static q.A.*; /** * The field {@link aTest aTest} has an {@link ATest#a}. diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/static_ref_out/StaticImportNoReference.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/static_ref_out/StaticImportNoReference.java index cb70d286d0..62ebd5614b 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/static_ref_out/StaticImportNoReference.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/static_ref_out/StaticImportNoReference.java @@ -1,6 +1,5 @@ package static_ref_out; - public class StaticImportNoReference { public void foo() { } diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java index cc190a6ec2..f1d9ed9a24 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java @@ -1027,7 +1027,7 @@ public class MoveTest extends RefactoringTest { String oldD= "import org.test.Reference;public class Default {Reference ref;}"; String oldRef= "package org.test;import Default;public class Reference{Default d;}"; String newD= "package org;\nimport org.test.Reference;public class Default {Reference ref;}"; - String newRef= "package org.test;import org.Default;\npublic class Reference{Default d;}"; + String newRef= "package org.test;import org.Default;public class Reference{Default d;}"; ICompilationUnit cuD= getRoot().getPackageFragment("").createCompilationUnit("Default.java", oldD, false, new NullProgressMonitor()); IPackageFragment orgTest= getRoot().createPackageFragment("org.test", false, new NullProgressMonitor()); ICompilationUnit cuRef= orgTest.createCompilationUnit("Reference.java", oldRef, false, new NullProgressMonitor()); @@ -1074,7 +1074,7 @@ public class MoveTest extends RefactoringTest { String oldD= "import org.test.Reference;public class Default {Reference ref;}"; String oldRef= "package org.test;import Default;public class Reference{Default d;}"; String newD= "package org;\nimport org.test.Reference;public class Default {Reference ref;}"; - String newRef= "package org.test;import org.Default;\npublic class Reference{Default d;}"; + String newRef= "package org.test;import org.Default;public class Reference{Default d;}"; ICompilationUnit cuD= getRoot().getPackageFragment("").createCompilationUnit("Default.java", oldD, false, new NullProgressMonitor()); IPackageFragment orgTest= getRoot().createPackageFragment("org.test", false, new NullProgressMonitor()); ICompilationUnit cuRef= orgTest.createCompilationUnit("Reference.java", oldRef, false, new NullProgressMonitor()); diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java index 0543722196..ad372d50ea 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 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 @@ -90,9 +90,9 @@ public class AddImportTest extends CoreTests { StringBuffer buf= new StringBuffer(); buf.append("package pack1;\n"); buf.append("\n"); + buf.append("import java.util.Map;\n"); buf.append("import java.util.Set;\n"); buf.append("import java.util.Vector;\n"); - buf.append("import java.util.Map;\n"); buf.append("\n"); buf.append("import pack.List;\n"); buf.append("import pack.List2;\n"); @@ -114,17 +114,17 @@ public class AddImportTest extends CoreTests { buf.append("package pack1;\n"); buf.append("\n"); buf.append("import java.net.Socket;\n"); + buf.append("import java.util.Map;\n"); buf.append("import java.util.Set;\n"); buf.append("import java.util.Vector;\n"); - buf.append("import java.util.Map;\n"); buf.append("\n"); buf.append("import com.something.Foo;\n"); buf.append("\n"); - buf.append("import p.A;\n"); - buf.append("\n"); buf.append("import pack.List;\n"); buf.append("import pack.List2;\n"); buf.append("\n"); + buf.append("import p.A;\n"); + buf.append("\n"); buf.append("public class C {\n"); buf.append("}\n"); assertEqualString(cu.getSource(), buf.toString()); @@ -225,8 +225,7 @@ public class AddImportTest extends CoreTests { buf= new StringBuffer(); buf.append("package pack1;\n"); buf.append("\n"); - buf.append("import java.util.Vector;\n"); - buf.append("import java.util.Map;\n"); + buf.append("import java.util.*;\n"); buf.append("\n"); buf.append("import pack.List2;\n"); buf.append("\n"); diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java index af2a5c0fd1..1acfea87df 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 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 @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * John Glassmyer <jogl@google.com> - import group sorting is broken - https://bugs.eclipse.org/430303 *******************************************************************************/ package org.eclipse.jdt.ui.tests.core; @@ -418,6 +419,7 @@ public class ImportOrganizeTest extends CoreTests { buf= new StringBuffer(); buf.append("package test1;\n"); + buf.append("\n"); buf.append("public class C {\n"); buf.append("}\n"); assertEqualString(cu.getSource(), buf.toString()); @@ -682,8 +684,13 @@ public class ImportOrganizeTest extends CoreTests { buf.append("package pack1;\n"); buf.append("\n"); buf.append("// comment 1\n"); - buf.append("/*lead 1*//*lead 2*/ /**lead 3*/import java.util.*; //test3\n"); - buf.append("//test1/*test2*/\n"); + buf.append("/*lead 1*/\n"); + buf.append("//test1\n"); + buf.append("/*lead 2*/\n"); + buf.append("/*test2*/\n"); + buf.append("/**lead 3*/\n"); + buf.append("//test3\n"); + buf.append("import java.util.*;\n"); buf.append(""); buf.append("\n"); buf.append("/**comment 2*/\n"); @@ -715,6 +722,12 @@ public class ImportOrganizeTest extends CoreTests { buf.append("}\n"); pack2.createCompilationUnit("List2.java", buf.toString(), false, null); + buf= new StringBuffer(); + buf.append("package pack;\n"); + buf.append("public class List3 {\n"); + buf.append("}\n"); + pack2.createCompilationUnit("List3.java", buf.toString(), false, null); + IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null); buf= new StringBuffer(); @@ -726,6 +739,7 @@ public class ImportOrganizeTest extends CoreTests { buf.append("\n"); buf.append("import pack.List;\n"); buf.append("import pack.List2;\n"); + buf.append("import pack.List3;\n"); buf.append("\n"); buf.append("public class C {\n"); buf.append(" Vector v;\n"); @@ -733,7 +747,8 @@ public class ImportOrganizeTest extends CoreTests { buf.append(" Map v3;\n"); buf.append(" List v4;\n"); buf.append(" List2 v5;\n"); - buf.append(" String v6;\n"); + buf.append(" List3 v6;\n"); + buf.append(" String v7;\n"); buf.append("}\n"); ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null); @@ -741,6 +756,8 @@ public class ImportOrganizeTest extends CoreTests { String[] order= new String[] { "java", "pack" }; IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {}); + // Setting on-demand threshold to 2 ensures that the 2 reducible imports (pack.List2 and + // pack.List3) will be reduced into an on-demand import. OrganizeImportsOperation op= createOperation(cu, order, 2, false, true, true, query); op.run(null); @@ -758,7 +775,8 @@ public class ImportOrganizeTest extends CoreTests { buf.append(" Map v3;\n"); buf.append(" List v4;\n"); buf.append(" List2 v5;\n"); - buf.append(" String v6;\n"); + buf.append(" List3 v6;\n"); + buf.append(" String v7;\n"); buf.append("}\n"); assertEqualString(cu.getSource(), buf.toString()); } @@ -2203,7 +2221,6 @@ public class ImportOrganizeTest extends CoreTests { buf= new StringBuffer(); buf.append("package test;\n"); buf.append("\n"); - buf.append("\n"); buf.append("public class Test {\n"); buf.append(" /**\n"); buf.append(" * @see #max\n"); @@ -2453,9 +2470,10 @@ public class ImportOrganizeTest extends CoreTests { buf= new StringBuffer(); buf.append("package pack1;\n"); buf.append("/**comment1*/\n"); - buf.append("/*lead1*/"); + buf.append("/*lead1*/\n"); + buf.append("// trail 1\n"); buf.append("import java.util.ArrayList;\n"); - buf.append("import java.util.HashMap;// trail 1\n"); + buf.append("import java.util.HashMap;\n"); buf.append("\n"); buf.append("public class C {\n"); buf.append(" public void foo() {\n"); @@ -2679,8 +2697,6 @@ public class ImportOrganizeTest extends CoreTests { buf.append("\n"); buf.append("import java.util.ArrayList;\n"); buf.append("import java.util.HashMap;\n"); - buf.append("// some comment;\n"); - buf.append("/*another comment*/\n"); buf.append("\n"); buf.append("public class C {\n"); buf.append(" public void foo() {\n"); @@ -2731,8 +2747,6 @@ public class ImportOrganizeTest extends CoreTests { buf.append("import java.util.HashMap;\n"); buf.append("\n"); buf.append("import static java.io.File.pathSeparator;\n"); - buf.append("// some comment;\n"); - buf.append("/*another comment*/\n"); buf.append("\n"); buf.append("public class C {\n"); buf.append(" public void foo() {\n"); @@ -2914,6 +2928,7 @@ public class ImportOrganizeTest extends CoreTests { buf= new StringBuffer(); buf.append("@Foo\n"); buf.append("package pack1;\n"); + buf.append("\n"); buf.append("import pack2.Foo;\n"); assertEqualString(cu.getSource(), buf.toString()); } @@ -2996,6 +3011,7 @@ public class ImportOrganizeTest extends CoreTests { buf.append(" */\n"); buf.append("@Foo\n"); buf.append("package pack1;\n"); + buf.append("\n"); buf.append("import pack2.Foo;\n"); // no import for Bar assertEqualString(cu.getSource(), buf.toString()); } @@ -3195,7 +3211,6 @@ public class ImportOrganizeTest extends CoreTests { buf= new StringBuffer(); buf.append("package p;\n"); buf.append("\n"); - buf.append("\n"); buf.append("/**\n"); buf.append(" * {@link I}.\n"); buf.append(" * @see C\n"); diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java index 344a7b33e0..5c433de90b 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java @@ -9032,8 +9032,8 @@ public class AssistQuickFixTest extends QuickFixTest { IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null); StringBuffer buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? extends Date> list) {\n"); buf.append(" list\n"); @@ -9056,8 +9056,8 @@ public class AssistQuickFixTest extends QuickFixTest { String[] expected= new String[3]; buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? extends Date> list) {\n"); buf.append(" for (Date date : list) {\n"); @@ -9069,9 +9069,9 @@ public class AssistQuickFixTest extends QuickFixTest { buf= new StringBuffer(); buf.append("package test1;\n"); + buf.append("import java.util.Date;\n"); buf.append("import java.util.Iterator;\n"); buf.append("import java.util.List;\n"); - buf.append("import java.util.Date;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? extends Date> list) {\n"); buf.append(" for (Iterator<? extends Date> iterator = list.iterator(); iterator\n"); @@ -9085,8 +9085,8 @@ public class AssistQuickFixTest extends QuickFixTest { buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? extends Date> list) {\n"); buf.append(" for (int i = 0; i < list.size(); i++) {\n"); @@ -9107,8 +9107,8 @@ public class AssistQuickFixTest extends QuickFixTest { IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null); StringBuffer buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? super Date> list) {\n"); buf.append(" list\n"); @@ -9131,8 +9131,8 @@ public class AssistQuickFixTest extends QuickFixTest { String[] expected= new String[3]; buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? super Date> list) {\n"); buf.append(" for (Object object : list) {\n"); @@ -9144,9 +9144,9 @@ public class AssistQuickFixTest extends QuickFixTest { buf= new StringBuffer(); buf.append("package test1;\n"); + buf.append("import java.util.Date;\n"); buf.append("import java.util.Iterator;\n"); buf.append("import java.util.List;\n"); - buf.append("import java.util.Date;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? super Date> list) {\n"); buf.append(" for (Iterator<? super Date> iterator = list.iterator(); iterator\n"); @@ -9160,8 +9160,8 @@ public class AssistQuickFixTest extends QuickFixTest { buf= new StringBuffer(); buf.append("package test1;\n"); - buf.append("import java.util.List;\n"); buf.append("import java.util.Date;\n"); + buf.append("import java.util.List;\n"); buf.append("public class E {\n"); buf.append(" void foo(List<? super Date> list) {\n"); buf.append(" for (int i = 0; i < list.size(); i++) {\n"); |