1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
/**
* <copyright>
*
* Copyright (c) 2006 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM - Initial API and implementation
*
* </copyright>
*
* This is the source header
*/
import b;
import a ;
import org.eclipse.emf.ecore.util.EObjectCompositeEListNew;
/**
* Test similar to merge5 and 6. There are extra inner and top-level classes that are brought
* from source to target.
*/
protected abstract class EchoSoapBindingImpl implements echo.Echo
{
/**
* source comment for newMethodA()
*/
public static void newMethodA()
{
// first line comment
int a;
if (true)
{
a = 0;
}
}
// sort the three fields
/**
* @ordered
*/
int b;
/**
* source javadoc
* for InnerClass1
*
*/
public class InnerClass1
{
/**
*
* source javadoc line 1
* source javadoc line 2
* @ordered
*/
int b = 2;
/**
* @ordered
*/
int a
= 1;
}
/**
* @ordered
*/
int a;
/**
* @ordered
*/
int c;
// remove e
// move f to be before d
/**
* @ordered
*/
int f;
/**
* @ordered
*/
int d;
// remove b()
// remove c()
// add a()
/**
* source comment for a()
* this method should be added to target
*/
void a()
{
// source line comment inside a()
}
// remove e()
void d() {}
void f() {}
/**
* source javadoc
* for InnerClass2
*
*/
public class InnerClass2
{
int a
= 1;
/**
*
* source javadoc line 1
* source javadoc line 2
*/
int b = 2;
}
/**
* source comment for newMethodB()
*/
public static void newMethodB()
{
// first line comment
int a;
if (true)
{
a = 0;
}
}
}
/**
* source javadoc
* for AnotherClass
*
*/
public class AnotherClass
{
int a
= 1;
/**
*
* source javadoc line 1
* source javadoc line 2
*/
int b = 2;
}
/**
* source comment for TopLevelClass2
*/
class TopLevelClass2
{
}
|
