Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-23 13:08:01 +0000
committerStephan Herrmann2010-04-23 13:08:01 +0000
commitafd337653c506175b1f7c40d23de335e3d0927de (patch)
tree564841f4e6a3f60b41e48f1f3f902497c9d3030e /testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring
parent141f8a22878afe5badb5b0ef7cbe7bfc0fba864c (diff)
downloadorg.eclipse.objectteams-afd337653c506175b1f7c40d23de335e3d0927de.tar.gz
org.eclipse.objectteams-afd337653c506175b1f7c40d23de335e3d0927de.tar.xz
org.eclipse.objectteams-afd337653c506175b1f7c40d23de335e3d0927de.zip
revert r204 for these files:
- subversive changed file I did not edit, but refused to save those files that I copied and edited.
Diffstat (limited to 'testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring')
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/B.java1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/T.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/T.java3
4 files changed, 8 insertions, 8 deletions
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
index 6c462925e..1ee2906d0 100644
--- 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
@@ -3,6 +3,5 @@ package p;
public class B{
public void m(int i, String s)
{
- String g = 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
index 6666901d1..fd9157afd 100644
--- 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
@@ -2,9 +2,10 @@ package p;
public team class T{
protected class R playedBy B{
- void n(int j){
+ callin void n(int j){
int v = j;
+ base.n(j);
}
- n <- before m;
+ 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
index 0013601aa..5f1937221 100644
--- 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
@@ -3,17 +3,16 @@ package p;
public class B{
public void m(int i, String s)
{
- n(i);
- base_m(i, s);
+ n(i, s);
}
- private void n(int j)
+ private void n(int j, String s)
{
int v = j;
+ base_m(j, s);
}
public void base_m(int i, String s)
{
- String g = 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
index 4e95d87f8..d66fa7513 100644
--- 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
@@ -2,8 +2,9 @@ package p;
public team class T{
protected class R playedBy B{
- void n(int j){
+ callin void n(int j){
int v = j;
+ base.n(j);
}
}
} \ No newline at end of file

Back to the top