diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java index 14b71ab..58e3e71 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java @@ -3,31 +3,31 @@ package p; /** typecomment template*/ public interface I { - public abstract void x(); + void x(); // TestRunListener implementation - public abstract void y() /* nasty */; + void y() /* nasty */; - public abstract void z() // xx + void z() // xx ; /** Javadoc*/ - abstract public void a() /**post-Javadoc*/ + void a() /**post-Javadoc*/ ; /**JD*/ //abstract - public abstract void b(); + void b(); //destruct - public abstract void c() + void c() /* Comments*/ /** en */ // gros! ; //post - public abstract void d(); + void d(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java index 8c8e813..9adf03d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m1(); + void m1(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java index 218e40a..96dae3d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m2(); + void m2(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java index 8c8e813..9adf03d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m1(); + void m1(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java index 218e40a..96dae3d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m2(); + void m2(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java index c5fc680..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - abstract public void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test110/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test110/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test110/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test110/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java index 1f5efbe..854aa5d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java @@ -3,8 +3,8 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); - public abstract void m1(); + void m1(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java index a1364c5..74b1bc4 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java @@ -5,6 +5,6 @@ import java.util.List; /** typecomment template*/ interface I { - public abstract List m(); + List m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java index 1f5efbe..854aa5d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java @@ -3,8 +3,8 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); - public abstract void m1(); + void m1(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java index d33a7aa..59a4b6b 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java @@ -5,6 +5,6 @@ import java.io.IOException; /** typecomment template*/ interface I { - public abstract void m() throws IOException; + void m() throws IOException; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java index b2d1c30..c6da748 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java @@ -7,6 +7,6 @@ import java.util.Set; /** typecomment template*/ interface I { - public abstract List m(Set set) throws IOException; + List m(Set set) throws IOException; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java index 73e1234..f606632 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java @@ -7,6 +7,6 @@ import java.util.Set; /** typecomment template*/ interface I { - public abstract List m(Set set, Set set1) throws IOException; + List m(Set set, Set set1) throws IOException; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java index d35d188..4fab16e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java index 12b236f..bc3db51 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(I foo); + void m(I foo); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java index 1b927d7..9e70b1d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract int amount(); + int amount(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java index 1b927d7..9e70b1d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract int amount(); + int amount(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java index 1b927d7..9e70b1d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract int amount(); + int amount(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java index 1b927d7..9e70b1d 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract int amount(); + int amount(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java index 09e25e0..effec91 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract int amount(); + int amount(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java index a907fc3..c3b833f 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract I m(I foo); + I m(I foo); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java index 4268653..fa4bd43 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java @@ -3,8 +3,8 @@ package p; /** typecomment template*/ interface I { - public abstract I getFoo(); + I getFoo(); - public abstract void foo(I foo); + void foo(I foo); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java index 65c216b..71252a8 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java @@ -7,6 +7,6 @@ import java.util.Set; /** typecomment template*/ interface I { - public abstract List m(Set set, String string) throws IOException; + List m(Set set, String string) throws IOException; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java index 41edaba..a83829e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java @@ -6,38 +6,38 @@ public interface I { /** * comment f */ - public abstract void f(); + void f(); /** comment fz*/ - public abstract void fz(); + void fz(); /** * comment f1 */ - public abstract void f1(); + void f1(); /** comment f1z*/ - public abstract void f1z(); + void f1z(); //comment f11 - public abstract void f11(); + void f11(); - public abstract void f2(); + void f2(); /** * jdoc I1 */ - public static final int I1= 0; + int I1= 0; /** jdoc I1z*/ - public static final int I1z= 0; + int I1z= 0; /** * comI2 */ - public static final int I2= 0; + int I2= 0; /** com I2z*/ - public static final int I2z= 0; + int I2z= 0; //comment I3 - public static final int I3= 0; - public static final int I4= 0; + int I3= 0; + int I4= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java index 32a2241..a44d544 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(int i, boolean b, short s, char c, long l, double d); + void m(int i, boolean b, short s, char c, long l, double d); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java index d52e8ee..d8c80e6 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract int foo(); + int foo(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java index a2eebff..44b0f2c 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface IFoo { - public abstract void foo(); + void foo(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java index fbe645a..29452ce 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface I { - public abstract double dot(X v); + double dot(X v); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java index 9fe19ef..f2a9584 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; + int X= 0; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java index c5752c9..a7dd0dd 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java @@ -3,7 +3,7 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; /*constant comment*/ - public static final int Y= 0; //constant line comment + int X= 0; /*constant comment*/ + int Y= 0; //constant line comment } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java index c5752c9..a7dd0dd 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java @@ -3,7 +3,7 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; /*constant comment*/ - public static final int Y= 0; //constant line comment + int X= 0; /*constant comment*/ + int Y= 0; //constant line comment } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java index 061be50..3f86b37 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java @@ -3,7 +3,7 @@ package p; /** typecomment template*/ interface I { - public static final int X= 0; - public static final int Y= I.X + I.X; + int X= 0; + int Y= I.X + I.X; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java index 4a018ad..f089dab 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java index ee2febd..166237f 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java @@ -3,9 +3,9 @@ package p; /** typecomment template*/ interface I { - public static final int i= 0; + int i= 0; int j= 1; - public abstract void m(); + void m(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java index 5265bf7..6b9eba4 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java @@ -4,28 +4,28 @@ package p; interface I { /** method m javadoc comment */ - public abstract void m(); + void m(); /** field I javadoc comment */ int I= 9; /* method m1 regular comment */ - public abstract void m1(); + void m1(); /* field i1 regular comment */ int I1= 9; // method m2 line comment - public abstract void m2(); + void m2(); // field i2 line comment int I2= 9; - public abstract void m4(); /* method m4 regular comment */ + void m4(); /* method m4 regular comment */ int I4= 9; /* field i4 regular comment */ - public abstract void m5(); // method m5 line comment + void m5(); // method m5 line comment int I5= 9; // field i5 line comment diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java index 1853490..eb3d29e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract I a(I a1, I a2); + I a(I a1, I a2); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java index cc239b7..cf7562e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ interface I { - public abstract I a(); + I a(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java index 502337f..cb8b652 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java @@ -3,12 +3,12 @@ package p; /** typecomment template*/ interface I { - public abstract void foo0(); + void foo0(); - public abstract void foo1(); + void foo1(); - public abstract void foo2(); + void foo2(); - public abstract void foo3(); + void foo3(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java index e29b646..e436ce2 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java @@ -3,10 +3,10 @@ package p; /** typecomment template*/ interface Bag { - public abstract java.util.Iterator iterator(); + java.util.Iterator iterator(); - public abstract Bag add(Comparable e); + Bag add(Comparable e); - public abstract Bag addAll(Bag v1); + Bag addAll(Bag v1); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java index e29b646..e436ce2 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java @@ -3,10 +3,10 @@ package p; /** typecomment template*/ interface Bag { - public abstract java.util.Iterator iterator(); + java.util.Iterator iterator(); - public abstract Bag add(Comparable e); + Bag add(Comparable e); - public abstract Bag addAll(Bag v1); + Bag addAll(Bag v1); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromAbstractClass/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromAbstractClass/out/B.java index 82c93df..74ccaad 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromAbstractClass/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromAbstractClass/out/B.java @@ -3,8 +3,8 @@ package p; /** typecomment template*/ public interface B { - public abstract void abstractM(); + void abstractM(); - public abstract void m1(String s); + void m1(String s); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromClass/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromClass/out/B.java index 6269332..9f3724e 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromClass/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromClass/out/B.java @@ -3,6 +3,6 @@ package p; /** typecomment template*/ public interface B { - public abstract void m1(String s); + void m1(String s); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface1/out/B.java index bc20106..fcc1ffe 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface1/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface1/out/B.java @@ -3,14 +3,14 @@ package p; /** typecomment template*/ interface B { - public abstract void abstractM1(); + void abstractM1(); - public abstract void abstractM2(); + void abstractM2(); - public abstract void abstractM3(); + void abstractM3(); - public abstract void abstractM4(); + void abstractM4(); - public abstract void defaultM1(String s); + void defaultM1(String s); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface2/out/B.java index 2e8ff0f..99ca5e6 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface2/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface18/testExtractInterfaceFromInterface2/out/B.java @@ -3,14 +3,14 @@ package p; /** typecomment template*/ public interface B { - public abstract void abstractM1(); + void abstractM1(); - public abstract void abstractM2(); + void abstractM2(); - public abstract void abstractM3(); + void abstractM3(); - public abstract void abstractM4(); + void abstractM4(); - public abstract void defaultM1(); + void defaultM1(); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_1/out/B.java index 2e386bb..79c9fd9 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_1/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_1/out/B.java @@ -1,5 +1,5 @@ package p; interface B{ - static int m(){ return 1;} + int m(){ return 1;} } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_2/out/B.java index 2e386bb..79c9fd9 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_2/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18_2/out/B.java @@ -1,5 +1,5 @@ package p; interface B{ - static int m(){ return 1;} + int m(){ return 1;} } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java index ff52d86..2f752ee 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java @@ -1,5 +1,5 @@ package p; interface B{ - public static final int FRED= 1; + int FRED= 1; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java index 7df95eb..2f752ee 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java @@ -1,5 +1,5 @@ package p; interface B{ - public final int FRED= 1; + int FRED= 1; } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java index b5e3dad..11fd7f1 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java @@ -1,5 +1,5 @@ package p; interface B{ - public static final int i= 0; + int i= 0; } diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_1/out/A.java index 8021338..a210c27 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_1/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_1/out/A.java @@ -4,6 +4,6 @@ import org.eclipse.jdt.annotation.NonNull; public interface A { - public Integer getArea(@NonNull Integer length); + Integer getArea(@NonNull Integer length); } \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/A.java new file mode 100644 index 0000000..630d088 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/A.java @@ -0,0 +1,5 @@ +package p; + +public interface A { + +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/B.java new file mode 100644 index 0000000..7321e43 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/in/B.java @@ -0,0 +1,10 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public class B implements A { + + public static Integer getArea(@NonNull Integer length) { + return new Integer(length * length); + } +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/A.java new file mode 100644 index 0000000..a210c27 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/A.java @@ -0,0 +1,9 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public interface A { + + Integer getArea(@NonNull Integer length); + +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/B.java new file mode 100644 index 0000000..7321e43 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_2/out/B.java @@ -0,0 +1,10 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public class B implements A { + + public static Integer getArea(@NonNull Integer length) { + return new Integer(length * length); + } +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/A.java new file mode 100644 index 0000000..630d088 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/A.java @@ -0,0 +1,5 @@ +package p; + +public interface A { + +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/B.java new file mode 100644 index 0000000..b469d79 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/in/B.java @@ -0,0 +1,8 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public interface B { + + public static Integer getArea(@NonNull Integer length); +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/A.java new file mode 100644 index 0000000..a210c27 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/A.java @@ -0,0 +1,9 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public interface A { + + Integer getArea(@NonNull Integer length); + +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/B.java new file mode 100644 index 0000000..789c8b1 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18_3/out/B.java @@ -0,0 +1,10 @@ +package p; + +import org.eclipse.jdt.annotation.NonNull; + +public interface B { + + public static Integer getArea(@NonNull Integer length) { + return new Integer(length * length); + } +} \ No newline at end of file diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test46/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test46/out/A.java index 773bc55..e418cf5 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test46/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test46/out/A.java @@ -1,9 +1,9 @@ package p; interface A{ - public static final int CONST = 0; + int CONST = 0; - public int getConst(); + int getConst(); } class B implements A { diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test47/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test47/out/A.java index 68101e5..e2c42ed 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test47/out/A.java +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test47/out/A.java @@ -1,7 +1,7 @@ package p; public interface A { - public void method(); + void method(); } class B implements A { public final void method() { diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ExtractInterfaceProcessor.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ExtractInterfaceProcessor.java index 6784bfd..4a66b30 100644 --- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ExtractInterfaceProcessor.java +++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ExtractInterfaceProcessor.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Jerome Cambon - [code style] don't generate redundant modifiers "public static final abstract" for interface members - https://bugs.eclipse.org/71627 *******************************************************************************/ package org.eclipse.jdt.internal.corext.refactoring.structure; @@ -134,12 +135,8 @@ import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels; */ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcessor { - private static final String ATTRIBUTE_ABSTRACT= "abstract"; //$NON-NLS-1$ - private static final String ATTRIBUTE_COMMENTS= "comments"; //$NON-NLS-1$ - private static final String ATTRIBUTE_PUBLIC= "public"; //$NON-NLS-1$ - /** The identifier of this processor */ public static final String IDENTIFIER= "org.eclipse.jdt.ui.extractInterfaceProcessor"; //$NON-NLS-1$ @@ -169,9 +166,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess } } - /** Should extracted methods be declared as abstract? */ - private boolean fAbstract= true; - /** Should override annotations be generated? */ private boolean fAnnotations= false; @@ -184,9 +178,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess /** The members to extract */ private IMember[] fMembers= null; - /** Should extracted methods be declared as public? */ - private boolean fPublic= true; - /** The subtype where to extract the supertype */ private IType fSubType; @@ -371,9 +362,7 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess arguments.put(JavaRefactoringDescriptorUtil.ATTRIBUTE_NAME, fSuperName); for (int index= 0; index < fMembers.length; index++) arguments.put(JavaRefactoringDescriptorUtil.ATTRIBUTE_ELEMENT + (index + 1), JavaRefactoringDescriptorUtil.elementToHandle(project, fMembers[index])); - arguments.put(ATTRIBUTE_ABSTRACT, Boolean.valueOf(fAbstract).toString()); arguments.put(ATTRIBUTE_COMMENTS, Boolean.valueOf(fComments).toString()); - arguments.put(ATTRIBUTE_PUBLIC, Boolean.valueOf(fPublic).toString()); arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplace).toString()); arguments.put(ATTRIBUTE_INSTANCEOF, Boolean.valueOf(fInstanceOf).toString()); final DynamicValidationRefactoringChange change= new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.ExtractInterfaceRefactoring_name, fChangeManager.getAllChanges()); @@ -478,6 +467,10 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess if (!current.getName().getIdentifier().equals(fragment.getName().getIdentifier())) rewriter.remove(current, null); } + int modifiers= field.getModifiers(); + modifiers= JdtFlags.clearAccessModifiers(modifiers); + modifiers= JdtFlags.clearFlag(Modifier.ABSTRACT | Modifier.STATIC | Modifier.FINAL, modifiers); + ModifierRewrite.create(rewrite, field).setModifiers(modifiers, null); final ICompilationUnit unit= sourceRewrite.getCu(); final ITextFileBuffer buffer= RefactoringFileBuffers.acquire(unit); try { @@ -671,20 +664,10 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess if (declaration.getBody() != null) rewrite.remove(declaration.getBody(), null); ListRewrite list= rewrite.getListRewrite(declaration, declaration.getModifiersProperty()); - boolean publicFound= false; - boolean abstractFound= false; Annotation annotation= null; for (IExtendedModifier extended : (List) declaration.modifiers()) { if (!extended.isAnnotation()) { Modifier modifier= (Modifier) extended; - if (fPublic && modifier.getKeyword().equals(Modifier.ModifierKeyword.PUBLIC_KEYWORD)) { - publicFound= true; - continue; - } - if (fAbstract && modifier.getKeyword().equals(Modifier.ModifierKeyword.ABSTRACT_KEYWORD)) { - abstractFound= true; - continue; - } list.remove(modifier, null); } else if (extended.isAnnotation()) { annotation= (Annotation) extended; @@ -693,11 +676,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess list.remove(annotation, null); } } - ModifierRewrite rewriter= ModifierRewrite.create(rewrite, declaration); - if (fPublic && !publicFound) - rewriter.setVisibility(Modifier.PUBLIC, null); - if (fAbstract && !abstractFound) - rewriter.setModifiers(Modifier.ABSTRACT, 0, null); for (SingleVariableDeclaration param : (List) declaration.parameters()) { ListRewrite modifierRewrite= rewrite.getListRewrite(param, SingleVariableDeclaration.MODIFIERS2_PROPERTY); @@ -773,16 +751,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess } } - /** - * Should extracted methods be declared as abstract? - * - * @return true if the should be declared as abstract, - * false otherwise - */ - public final boolean getAbstract() { - return fAbstract; - } - /* * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getElements() */ @@ -869,16 +837,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess } /** - * Should extracted methods be declared as public? - * - * @return true if the should be declared as public, - * false otherwise - */ - public final boolean getPublic() { - return fPublic; - } - - /** * Returns the type where to extract an interface. * * @return the type where to extract an interface @@ -923,11 +881,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess return status; } else return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_argument_not_exist, JavaRefactoringDescriptorUtil.ATTRIBUTE_NAME)); - final String deferred= extended.getAttribute(ATTRIBUTE_ABSTRACT); - if (deferred != null) { - fAbstract= Boolean.valueOf(deferred).booleanValue(); - } else - return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_argument_not_exist, ATTRIBUTE_ABSTRACT)); final String comment= extended.getAttribute(ATTRIBUTE_COMMENTS); if (comment != null) { fComments= Boolean.valueOf(comment).booleanValue(); @@ -938,11 +891,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess fInstanceOf= Boolean.valueOf(instance).booleanValue(); } else return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_argument_not_exist, ATTRIBUTE_INSTANCEOF)); - final String visibility= extended.getAttribute(ATTRIBUTE_PUBLIC); - if (visibility != null) { - fPublic= Boolean.valueOf(visibility).booleanValue(); - } else - return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_argument_not_exist, ATTRIBUTE_PUBLIC)); final String replace= extended.getAttribute(ATTRIBUTE_REPLACE); if (replace != null) { fReplace= Boolean.valueOf(replace).booleanValue(); @@ -1190,17 +1138,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess } /** - * Determines whether extracted methods should be declared as abstract. - * - * @param declare - * true to declare them public, false - * otherwise - */ - public final void setAbstract(final boolean declare) { - fAbstract= declare; - } - - /** * Determines whether override annotations should be generated. * * @param annotations true to generate override annotations, false otherwise @@ -1233,17 +1170,6 @@ public final class ExtractInterfaceProcessor extends SuperTypeRefactoringProcess } /** - * Determines whether extracted methods should be declared as public. - * - * @param declare - * true to declare them public, false - * otherwise - */ - public final void setPublic(final boolean declare) { - fPublic= declare; - } - - /** * Sets the new interface name. * * @param name diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MoveStaticMembersProcessor.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MoveStaticMembersProcessor.java index 78deea2..f4db08e 100644 --- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MoveStaticMembersProcessor.java +++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MoveStaticMembersProcessor.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Jerome Cambon - [code style] don't generate redundant modifiers "public static final abstract" for interface members - https://bugs.eclipse.org/71627 *******************************************************************************/ package org.eclipse.jdt.internal.corext.refactoring.structure; @@ -963,6 +964,12 @@ public final class MoveStaticMembersProcessor extends MoveProcessor implements I } } } + if (fDestinationType.isInterface()) { + int modifiers= declaration.getModifiers(); + modifiers= JdtFlags.clearAccessModifiers(modifiers); + modifiers= JdtFlags.clearFlag(Modifier.ABSTRACT | Modifier.STATIC | Modifier.FINAL, modifiers); + ModifierRewrite.create(fSource.getASTRewrite(), declaration).setModifiers(modifiers, null); + } ITrackedNodePosition trackedPosition= fSource.getASTRewrite().track(declaration); declaration.setProperty(TRACKED_POSITION_PROPERTY, trackedPosition); targetNeedsSourceImport|= analyzer.targetNeedsSourceImport(); diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java index 27b051f..3a784d6 100644 --- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java +++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Benjamin Muskalla - 228950: [pull up] exception if target calls super with multiple parameters + * Jerome Cambon - [code style] don't generate redundant modifiers "public static final abstract" for interface members - https://bugs.eclipse.org/71627 *******************************************************************************/ package org.eclipse.jdt.internal.corext.refactoring.structure; @@ -1153,8 +1154,6 @@ public class PullUpRefactoringProcessor extends HierarchyProcessor { final VariableDeclarationFragment oldField= ASTNodeSearchUtil.getFieldDeclarationFragmentNode((IField) member, root); if (oldField != null) { int flags= getModifiersWithUpdatedVisibility(member, member.getFlags(), adjustments, new SubProgressMonitor(subsub, 1), true, status); - if (destination.isInterface()) - flags|= Flags.AccFinal; final FieldDeclaration newField= createNewFieldDeclarationNode(rewriter, root, (IField) member, oldField, mapping, new SubProgressMonitor(subsub, 1), status, flags); rewriter.getListRewrite(declaration, declaration.getBodyDeclarationsProperty()).insertAt(newField, ASTNodes.getInsertionIndex(newField, declaration.bodyDeclarations()), rewrite.createCategorizedGroupDescription(RefactoringCoreMessages.HierarchyRefactoring_add_member, SET_PULL_UP)); ImportRewriteUtil.addImports(rewrite, context, oldField.getParent(), new HashMap(), new HashMap(), false); @@ -1626,9 +1625,8 @@ public class PullUpRefactoringProcessor extends HierarchyProcessor { return JdtFlags.clearAccessModifiers(modifiers) | Modifier.PROTECTED; } if (getDestinationType().isInterface()) { - final int flags= JdtFlags.clearAccessModifiers(modifiers) | Modifier.PUBLIC; - if (member instanceof IMethod) - return JdtFlags.clearFlag(Modifier.STATIC, flags); + int flags= JdtFlags.clearAccessModifiers(modifiers); + flags= JdtFlags.clearFlag(Modifier.ABSTRACT | Modifier.STATIC | Modifier.FINAL, flags); return flags; } return modifiers; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java index 6fc8a45..ddc73f9 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2014 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 + * Jerome Cambon - [code style] don't generate redundant modifiers "public static final abstract" for interface members - https://bugs.eclipse.org/71627 *******************************************************************************/ package org.eclipse.jdt.internal.ui.refactoring; @@ -43,7 +44,6 @@ import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor; -import org.eclipse.jdt.internal.corext.util.Messages; import org.eclipse.jdt.ui.JavaElementComparator; import org.eclipse.jdt.ui.JavaElementLabels; @@ -76,15 +76,11 @@ public class ExtractInterfaceWizard extends RefactoringWizard { private static class ExtractInterfaceInputPage extends TextInputWizardPage { private Button fReplaceAllCheckbox; - private Button fDeclarePublicCheckbox; - private Button fDeclareAbstractCheckbox; private Button fGenerateAnnotationsCheckbox; private Button fGenerateCommentsCheckbox; private Button fInstanceofCheckbox; private CheckboxTableViewer fTableViewer; private static final String DESCRIPTION = RefactoringMessages.ExtractInterfaceInputPage_description; - private static final String SETTING_PUBLIC= "Public";//$NON-NLS-1$ - private static final String SETTING_ABSTRACT= "Abstract";//$NON-NLS-1$ private static final String SETTING_ANNOTATIONS= "Annotations";//$NON-NLS-1$ private static final String SETTING_REPLACE= "Replace"; //$NON-NLS-1$ private static final String SETTING_COMMENTS= "Comments"; //$NON-NLS-1$ @@ -123,8 +119,6 @@ public class ExtractInterfaceWizard extends RefactoringWizard { fInstanceofCheckbox.setEnabled(fReplaceAllCheckbox.getSelection()); } }); - addDeclareAsPublicCheckbox(result); - addDeclareAsAbstractCheckbox(result); addGenerateAnnotationsCheckbox(result); Label separator= new Label(result, SWT.NONE); @@ -156,7 +150,7 @@ public class ExtractInterfaceWizard extends RefactoringWizard { public void widgetSelected(SelectionEvent e) { fProcessor.setAnnotations(fGenerateAnnotationsCheckbox.getSelection()); } - }); + }); } private void addGenerateCommentsCheckbox(Composite result) { @@ -236,8 +230,6 @@ public class ExtractInterfaceWizard extends RefactoringWizard { JavaPlugin.log(exception); } final boolean enabled= containsMethods(checked); - fDeclarePublicCheckbox.setEnabled(enabled); - fDeclareAbstractCheckbox.setEnabled(enabled); fGenerateAnnotationsCheckbox.setEnabled(enabled); fGenerateCommentsCheckbox.setEnabled(enabled); fInstanceofCheckbox.setEnabled(fReplaceAllCheckbox.getSelection()); @@ -320,35 +312,6 @@ public class ExtractInterfaceWizard extends RefactoringWizard { }); } - private void addDeclareAsPublicCheckbox(Composite result) { - String[] keys= {RefactoringMessages.ExtractInterfaceWizard_public_label}; - String title= Messages.format(RefactoringMessages.ExtractInterfaceWizard_12, keys); - boolean defaultValue= fProcessor.getPublic(); - fDeclarePublicCheckbox= createCheckbox(result, title, defaultValue); - fProcessor.setPublic(fDeclarePublicCheckbox.getSelection()); - fDeclarePublicCheckbox.addSelectionListener(new SelectionAdapter(){ - @Override - public void widgetSelected(SelectionEvent e) { - fProcessor.setPublic(fDeclarePublicCheckbox.getSelection()); - } - }); - } - - private void addDeclareAsAbstractCheckbox(Composite result) { - final ExtractInterfaceProcessor processor= fProcessor; - String[] keys= {RefactoringMessages.ExtractInterfaceWizard_abstract_label}; - String title= Messages.format(RefactoringMessages.ExtractInterfaceWizard_12, keys); - boolean defaultValue= processor.getAbstract(); - fDeclareAbstractCheckbox= createCheckbox(result, title, defaultValue); - processor.setAbstract(fDeclareAbstractCheckbox.getSelection()); - fDeclareAbstractCheckbox.addSelectionListener(new SelectionAdapter(){ - @Override - public void widgetSelected(SelectionEvent e) { - processor.setAbstract(fDeclareAbstractCheckbox.getSelection()); - } - }); - } - private static Button createCheckbox(Composite parent, String title, boolean value){ Button checkBox= new Button(parent, SWT.CHECK); checkBox.setText(title); @@ -404,8 +367,6 @@ public class ExtractInterfaceWizard extends RefactoringWizard { fProcessor.setTypeName(getText()); fProcessor.setReplace(fReplaceAllCheckbox.getSelection()); fProcessor.setExtractedMembers(getCheckedMembers()); - fProcessor.setAbstract(fDeclareAbstractCheckbox.getSelection()); - fProcessor.setPublic(fDeclarePublicCheckbox.getSelection()); fProcessor.setAnnotations(fGenerateAnnotationsCheckbox.getSelection()); fProcessor.setComments(fGenerateCommentsCheckbox.getSelection()); fProcessor.setInstanceOf(fInstanceofCheckbox.getSelection()); @@ -426,9 +387,7 @@ public class ExtractInterfaceWizard extends RefactoringWizard { } private void initializeCheckboxes() { - initializeCheckBox(fDeclarePublicCheckbox, SETTING_PUBLIC, true); - initializeCheckBox(fDeclareAbstractCheckbox, SETTING_ABSTRACT, true); - initializeCheckBox(fGenerateAnnotationsCheckbox, SETTING_ANNOTATIONS, true); + initializeCheckBox(fGenerateAnnotationsCheckbox, SETTING_ANNOTATIONS, true); initializeCheckBox(fReplaceAllCheckbox, SETTING_REPLACE, true); initializeCheckBox(fGenerateCommentsCheckbox, SETTING_COMMENTS, true); initializeCheckBox(fInstanceofCheckbox, SETTING_INSTANCEOF, false); @@ -444,8 +403,6 @@ public class ExtractInterfaceWizard extends RefactoringWizard { private void storeDialogSettings() { final IDialogSettings settings= JavaPlugin.getDefault().getDialogSettings(); - settings.put(SETTING_PUBLIC, fDeclarePublicCheckbox.getSelection()); - settings.put(SETTING_ABSTRACT, fDeclareAbstractCheckbox.getSelection()); settings.put(SETTING_ANNOTATIONS, fGenerateAnnotationsCheckbox.getSelection()); settings.put(SETTING_REPLACE, fReplaceAllCheckbox.getSelection()); settings.put(SETTING_COMMENTS, fGenerateCommentsCheckbox.getSelection()); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/AbstractMethodCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/AbstractMethodCorrectionProposal.java index 7f9adc3..2bc32da 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/AbstractMethodCorrectionProposal.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/AbstractMethodCorrectionProposal.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2014 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 @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Benjamin Muskalla - [quick fix] Create Method in void context should 'box' void. - https://bugs.eclipse.org/bugs/show_bug.cgi?id=107985 + * Jerome Cambon - [code style] don't generate redundant modifiers "public static final abstract" for interface members - https://bugs.eclipse.org/71627 *******************************************************************************/ package org.eclipse.jdt.internal.ui.text.correction.proposals; @@ -20,6 +21,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTNode; @@ -153,7 +155,7 @@ public abstract class AbstractMethodCorrectionProposal extends LinkedCorrectionP addNewExceptions(rewrite, decl.thrownExceptionTypes()); Block body= null; - if (!fSenderBinding.isInterface()) { + if (!fSenderBinding.isInterface() && !Flags.isAbstract(decl.getModifiers())) { body= ast.newBlock(); String placeHolder= CodeGeneration.getMethodBodyContent(getCompilationUnit(), fSenderBinding.getName(), newNameNode.getIdentifier(), isConstructor(), bodyStatement, String.valueOf('\n')); if (placeHolder != null) { diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard.java index c7a0747..399211a 100644 --- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard.java +++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/RenameResourceWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2014 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 + * Jerome Cambon - [ltk] Rename refactoring should give more control over new file name - https://bugs.eclipse.org/391389 *******************************************************************************/ package org.eclipse.ltk.ui.refactoring.resource; @@ -81,7 +82,8 @@ public class RenameResourceWizard extends RefactoringWizard { label.setLayoutData(new GridData()); fNameField= new Text(composite, SWT.BORDER); - fNameField.setText(fRefactoringProcessor.getNewResourceName()); + String resourceName= fRefactoringProcessor.getNewResourceName(); + fNameField.setText(resourceName); fNameField.setFont(composite.getFont()); fNameField.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); fNameField.addModifyListener(new ModifyListener() { @@ -90,7 +92,12 @@ public class RenameResourceWizard extends RefactoringWizard { } }); - fNameField.selectAll(); + int lastIndexOfDot= resourceName.lastIndexOf('.'); + if ((fRefactoringProcessor.getResource().getType() == IResource.FILE) && (lastIndexOfDot > 0)) { + fNameField.setSelection(0, lastIndexOfDot); + } else { + fNameField.selectAll(); + } setPageComplete(false); setControl(composite); }