diff options
Diffstat (limited to 'testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin')
100 files changed, 1163 insertions, 0 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/B.java new file mode 100644 index 000000000..fd30e05f7 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/B.java @@ -0,0 +1,8 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/T.java new file mode 100644 index 000000000..af7713f7f --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ protected void n(){
+ }
+ n <- after m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/B.java new file mode 100644 index 000000000..f857c121c --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/B.java @@ -0,0 +1,19 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ int baseResult = base_m();
+ n();
+ return baseResult;
+ }
+
+ private void n()
+ {
+ }
+
+ public int base_m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/T.java new file mode 100644 index 000000000..9fa60fb71 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/T.java @@ -0,0 +1,8 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ protected void n(){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/B.java new file mode 100644 index 000000000..779358cc5 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+ public void m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/T.java new file mode 100644 index 000000000..47b7bbb5b --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ void n() <- after void m();
+ void n() <- after void m(int i);
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/B.java new file mode 100644 index 000000000..205da5752 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ base_m();
+ n();
+ }
+ private void n()
+ {
+ }
+ public void base_m()
+ {
+ }
+ public void m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/T.java new file mode 100644 index 000000000..24a136cc9 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ void n() <- after void m(int i);
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/T.java new file mode 100644 index 000000000..28d4f7d60 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/T.java @@ -0,0 +1,14 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ private void o(){
+ n();
+ }
+
+ private void n(){
+ }
+ n <- before m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/T.java new file mode 100644 index 000000000..42e5e137a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/B.java new file mode 100644 index 000000000..aa764ac63 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ n();
+ }
+
+ private void n()
+ {
+ base_m();
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/T.java new file mode 100644 index 000000000..92a33cbfd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/T.java @@ -0,0 +1,6 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/T.java new file mode 100644 index 000000000..65bb902fe --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/T.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ other();
+ }
+ n <- before m;
+
+ private void other(){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/T.java new file mode 100644 index 000000000..e9df03854 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ private int f;
+ public void n(){
+ f = 5;
+ }
+ n <- before m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/B.java new file mode 100644 index 000000000..1ee2906d0 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int i, String s)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/T.java new file mode 100644 index 000000000..fd9157afd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int j){
+ int v = j;
+ base.n(j);
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/B.java new file mode 100644 index 000000000..5f1937221 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m(int i, String s)
+ {
+ n(i, s);
+ }
+
+ private void n(int j, String s)
+ {
+ int v = j;
+ base_m(j, s);
+ }
+
+ public void base_m(int i, String s)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/T.java new file mode 100644 index 000000000..d66fa7513 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int j){
+ int v = j;
+ base.n(j);
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/B.java new file mode 100644 index 000000000..4ebd5c379 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/T.java new file mode 100644 index 000000000..fd9157afd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int j){
+ int v = j;
+ base.n(j);
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/B.java new file mode 100644 index 000000000..0a87f2de5 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ n(i);
+ }
+
+ private void n(int j)
+ {
+ int v = j;
+ base_m(j);
+ }
+
+ public void base_m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/T.java new file mode 100644 index 000000000..d66fa7513 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int j){
+ int v = j;
+ base.n(j);
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T1.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T1.java new file mode 100644 index 000000000..3701a6e24 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T1.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T1{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T2.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T2.java new file mode 100644 index 000000000..27cc7486a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T2.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T2{
+
+ T1 team1 = new Team1();
+
+ protected class R playedBy R<@team1>{
+ callin void n(){
+ base.n();
+ }
+ n <- replace n;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T1.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T1.java new file mode 100644 index 000000000..3701a6e24 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T1.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T1{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T2.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T2.java new file mode 100644 index 000000000..b3a05634d --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T2.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T2{
+
+ T1 team1 = new Team1();
+
+ protected class R playedBy R<@team1>{
+ void n() -> void n();
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/B.java new file mode 100644 index 000000000..40330f0d5 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+ public void m1()
+ {
+ }
+ public void m2()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/T.java new file mode 100644 index 000000000..39b6aee95 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ n <- after m1,m2;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/B.java new file mode 100644 index 000000000..3a5b24c91 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/B.java @@ -0,0 +1,23 @@ +package p;
+
+public class B{
+ public void m1()
+ {
+ base_m1();
+ n();
+ }
+ private void n()
+ {
+ }
+ public void base_m1()
+ {
+ }
+ public void m2()
+ {
+ base_m2();
+ n();
+ }
+ public void base_m2()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/T.java new file mode 100644 index 000000000..600c0a9bf --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/T.java @@ -0,0 +1,8 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/B.java new file mode 100644 index 000000000..39022357b --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+ public void m2()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/T.java new file mode 100644 index 000000000..4012a6a43 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ n <- after m,m2;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/B.java new file mode 100644 index 000000000..6f11091f6 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ base_m();
+ n();
+ }
+ private void n()
+ {
+ }
+ public void base_m()
+ {
+ }
+ public void m2()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/T.java new file mode 100644 index 000000000..f48b7883c --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ n <- after m2;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/B.java new file mode 100644 index 000000000..4ebd5c379 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/T.java new file mode 100644 index 000000000..42e5e137a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/B.java new file mode 100644 index 000000000..d76f77e8b --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ n(i);
+ }
+
+ private void n(int i)
+ {
+ base_m(i);
+ }
+
+ public void base_m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/T.java new file mode 100644 index 000000000..6ae4f36e2 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/B.java new file mode 100644 index 000000000..4ebd5c379 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/T.java new file mode 100644 index 000000000..1e8f9dd32 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ int i;
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/B.java new file mode 100644 index 000000000..8da1929dc --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m(int i)
+ {
+ n(i);
+ }
+
+ private void n(int i2)
+ {
+ int i;
+ base_m(i2);
+ }
+
+ public void base_m(int i)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/T.java new file mode 100644 index 000000000..2e3c6e74e --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ int i;
+ base.n();
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/B.java new file mode 100644 index 000000000..fd30e05f7 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/B.java @@ -0,0 +1,8 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/T.java new file mode 100644 index 000000000..d7f2bb9cf --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ int i = 1;
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/B.java new file mode 100644 index 000000000..ea6bf7b68 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/B.java @@ -0,0 +1,21 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return n();
+ }
+
+ private int n()
+ {
+ int baseResult;
+ baseResult = base_m();
+ int i = 1;
+ return baseResult;
+ }
+
+ public int base_m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/T.java new file mode 100644 index 000000000..bf3e97569 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ int i = 1;
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/B.java new file mode 100644 index 000000000..fd30e05f7 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/B.java @@ -0,0 +1,8 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/T.java new file mode 100644 index 000000000..9635554bf --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/T.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ int i = 1;
+ }
+ void n() <- replace int m() with{
+ 5 -> result
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/B.java new file mode 100644 index 000000000..acee00a37 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/B.java @@ -0,0 +1,20 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return n();
+ }
+
+ private int n()
+ {
+ base_m();
+ int i = 1;
+ return 5;
+ }
+
+ public int base_m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/T.java new file mode 100644 index 000000000..bf3e97569 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ int i = 1;
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/T.java new file mode 100644 index 000000000..4da59af1e --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/T.java @@ -0,0 +1,17 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ if(true){
+ base.n();
+ return;
+ }else{
+ base.n();
+ return;
+ }
+ return;
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/B.java new file mode 100644 index 000000000..00c13d202 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/B.java @@ -0,0 +1,24 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ n();
+ }
+
+ private void n()
+ {
+ if (true) {
+ base_m();
+ return;
+ } else {
+ base_m();
+ return;
+ }
+ return;
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/T.java new file mode 100644 index 000000000..f50350256 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/T.java @@ -0,0 +1,16 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ if(true){
+ base.n();
+ return;
+ }else{
+ base.n();
+ return;
+ }
+ return;
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/B.java new file mode 100644 index 000000000..1ee2906d0 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int i, String s)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/T.java new file mode 100644 index 000000000..f1bb28976 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int i, String s){
+ base.n(i, s);
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/B.java new file mode 100644 index 000000000..1e36403aa --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m(int i, String s)
+ {
+ n(i, s);
+ }
+
+ private void n(int i, String s)
+ {
+ base_m(i, s);
+ }
+
+ public void base_m(int i, String s)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/T.java new file mode 100644 index 000000000..aff236b83 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int i, String s){
+ base.n(i, s);
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/B.java new file mode 100644 index 000000000..fd30e05f7 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/B.java @@ -0,0 +1,8 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/T.java new file mode 100644 index 000000000..21d7884f6 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin int n(){
+ return base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/B.java new file mode 100644 index 000000000..a86c12f27 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public int m()
+ {
+ return n();
+ }
+
+ private int n()
+ {
+ return base_m();
+ }
+
+ public int base_m()
+ {
+ return 1;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/T.java new file mode 100644 index 000000000..169c6de1a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin int n(){
+ return base.n();
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/B.java new file mode 100644 index 000000000..44890c7a6 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int j, int k)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/T.java new file mode 100644 index 000000000..eb6209cd1 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/T.java @@ -0,0 +1,12 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int i){
+ base.n(i);
+ }
+ void n(int x) <- replace void m(int y, int z) with{
+ x <- z
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/B.java new file mode 100644 index 000000000..9c249041b --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m(int j, int k)
+ {
+ n(k, tunneledJ);
+ }
+
+ private void n(int i, int tunneledJ)
+ {
+ base_m(tunneledJ, i);
+ }
+
+ public void base_m(int j, int k)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/T.java new file mode 100644 index 000000000..5668b62bb --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(int i){
+ base.n(i);
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/B.java new file mode 100644 index 000000000..05e6ad85f --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+
+ public void v(){
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/T.java new file mode 100644 index 000000000..6d4bd56cf --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/T.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ void calloutV() -> void v();
+
+ protected void n(){
+ calloutV();
+ }
+ n <- after m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/B.java new file mode 100644 index 000000000..f9f96ed1d --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/B.java @@ -0,0 +1,21 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ base_m();
+ n();
+ }
+
+ private void n()
+ {
+ v();
+ }
+
+ public void base_m()
+ {
+ }
+
+ public void v(){
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/T.java new file mode 100644 index 000000000..077f84e92 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/T.java @@ -0,0 +1,12 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ void calloutV() -> void v();
+
+ protected void n(){
+ calloutV();
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/B.java new file mode 100644 index 000000000..bc10ba3f2 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+
+ private int f = 1;
+
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/T.java new file mode 100644 index 000000000..7fae22895 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/T.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ int getF() -> get int f;
+
+ protected void n(){
+ int g = getF();
+ }
+ n <- after m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/B.java new file mode 100644 index 000000000..14c54159b --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/B.java @@ -0,0 +1,21 @@ +package p;
+
+public class B{
+
+ private int f = 1;
+
+ public void m()
+ {
+ base_m();
+ n();
+ }
+
+ private void n()
+ {
+ int g = f;
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/T.java new file mode 100644 index 000000000..622201da2 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/T.java @@ -0,0 +1,12 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ int getF() -> get int f;
+
+ protected void n(){
+ int g = getF();
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/B.java new file mode 100644 index 000000000..e664af50d --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/B.java @@ -0,0 +1,10 @@ +package p;
+
+public class B{
+
+ private int f;
+
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/T.java new file mode 100644 index 000000000..5206abe15 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/T.java @@ -0,0 +1,13 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ int setF(int i) -> set int f;
+
+ protected void n(){
+ setF(1);
+ }
+ n <- after m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/B.java new file mode 100644 index 000000000..6fcaff30f --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/B.java @@ -0,0 +1,21 @@ +package p;
+
+public class B{
+
+ private int f;
+
+ public void m()
+ {
+ base_m();
+ n();
+ }
+
+ private void n()
+ {
+ f = 1;
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/T.java new file mode 100644 index 000000000..462752e55 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/T.java @@ -0,0 +1,12 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+
+ int setF(int i) -> set int f;
+
+ protected void n(){
+ setF(1);
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/B.java new file mode 100644 index 000000000..dcba9d3f0 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/B.java @@ -0,0 +1,8 @@ +package p;
+
+public class B{
+ // comment for method m()
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/T.java new file mode 100644 index 000000000..2239dc9a6 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ // comment for method n
+ public void n(){
+ }
+ // This is the long comment describing this callin.
+ n <- after m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/B.java new file mode 100644 index 000000000..40bfe24bc --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/B.java @@ -0,0 +1,18 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ base_m();
+ n();
+ }
+
+ private void n()
+ {
+ }
+
+ // comment for method m()
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/T.java new file mode 100644 index 000000000..e59439334 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ // comment for method n
+ public void n(){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/T.java new file mode 100644 index 000000000..52b254b9a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ n <- before m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/B.java new file mode 100644 index 000000000..25c8041f4 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ n();
+ base_m();
+ }
+
+ private void n()
+ {
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/T.java new file mode 100644 index 000000000..600c0a9bf --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/T.java @@ -0,0 +1,8 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ public void n(){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/B.java new file mode 100644 index 000000000..44890c7a6 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m(int j, int k)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/T.java new file mode 100644 index 000000000..d07ae8053 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/T.java @@ -0,0 +1,11 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ private void n(int i){
+ }
+ void n(int x) <- after void m(int y, int z) with{
+ x <- z + 1
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/B.java new file mode 100644 index 000000000..8cd15b166 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m(int j, int k)
+ {
+ base_m(j, k);
+ n(k + 1);
+ }
+
+ private void n(int i)
+ {
+ }
+
+ public void base_m(int j, int k)
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/T.java new file mode 100644 index 000000000..94eddc3a7 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/T.java @@ -0,0 +1,8 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ private void n(int i){
+ }
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/B.java new file mode 100644 index 000000000..2c0bdfccd --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/B.java @@ -0,0 +1,7 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/T.java new file mode 100644 index 000000000..42e5e137a --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/T.java @@ -0,0 +1,10 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ n <- replace m;
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/B.java new file mode 100644 index 000000000..aa764ac63 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/B.java @@ -0,0 +1,17 @@ +package p;
+
+public class B{
+ public void m()
+ {
+ n();
+ }
+
+ private void n()
+ {
+ base_m();
+ }
+
+ public void base_m()
+ {
+ }
+}
\ No newline at end of file diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/T.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/T.java new file mode 100644 index 000000000..6ae4f36e2 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/T.java @@ -0,0 +1,9 @@ +package p;
+
+public team class T{
+ protected class R playedBy B{
+ callin void n(){
+ base.n();
+ }
+ }
+}
\ No newline at end of file |