View | Details | Raw Unified | Return to bug 25800
Collapse All | Expand All

(-)Disassembler.java (-238 / +35 lines)
Lines 43-122 Link Here
43
	private static final String EMPTY_OUTPUT = ""; //$NON-NLS-1$
43
	private static final String EMPTY_OUTPUT = ""; //$NON-NLS-1$
44
	private static final String VERSION_UNKNOWN = "unknown";//$NON-NLS-1$
44
	private static final String VERSION_UNKNOWN = "unknown";//$NON-NLS-1$
45
45
46
	private void decodeModifiersForField(StringBuffer buffer, int accessFlags) {
46
	private boolean appendModifier(StringBuffer buffer, int accessFlags, int modifierConstant, String modifier, boolean firstModifier) {
47
		boolean firstModifier = true;
47
		if ((accessFlags & modifierConstant) != 0) {		
48
		if ((accessFlags & IModifierConstants.ACC_FINAL) != 0) {
49
			if (!firstModifier) {
50
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
51
			}
52
			if (firstModifier) {
53
				firstModifier = false;
54
			}
55
			buffer.append("final"); //$NON-NLS-1$
56
		}
57
		if ((accessFlags & IModifierConstants.ACC_PRIVATE) != 0) {
58
			if (!firstModifier) {
59
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
60
			}
61
			if (firstModifier) {
62
				firstModifier = false;
63
			}
64
			buffer.append("private"); //$NON-NLS-1$
65
		}
66
		if ((accessFlags & IModifierConstants.ACC_PROTECTED) != 0) {
67
			if (!firstModifier) {
68
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
69
			}
70
			if (firstModifier) {
71
				firstModifier = false;
72
			}
73
			buffer.append("protected"); //$NON-NLS-1$
74
		}
75
		if ((accessFlags & IModifierConstants.ACC_PUBLIC) != 0) {
76
			if (!firstModifier) {
48
			if (!firstModifier) {
77
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
49
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
78
			}
50
			}
79
			if (firstModifier) {
51
			if (firstModifier) {
80
				firstModifier = false;
52
				firstModifier = false;
81
			}
53
			}
82
			buffer.append("public"); //$NON-NLS-1$
54
			buffer.append(modifier);
83
		}
84
		if ((accessFlags & IModifierConstants.ACC_STATIC) != 0) {
85
			if (!firstModifier) {
86
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
87
			}
88
			if (firstModifier) {
89
				firstModifier = false;
90
			}
91
			buffer.append("static"); //$NON-NLS-1$
92
		}
93
		if ((accessFlags & IModifierConstants.ACC_TRANSIENT) != 0) {
94
			if (!firstModifier) {
95
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
96
			}
97
			if (firstModifier) {
98
				firstModifier = false;
99
			}
100
			buffer.append("transient"); //$NON-NLS-1$
101
		}
102
		if ((accessFlags & IModifierConstants.ACC_VOLATILE) != 0) {
103
			if (!firstModifier) {
104
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
105
			}
106
			if (firstModifier) {
107
				firstModifier = false;
108
			}
109
			buffer.append("volatile"); //$NON-NLS-1$
110
		}
111
		if ((accessFlags & IModifierConstants.ACC_ENUM) != 0) {
112
			if (!firstModifier) {
113
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
114
			}
115
			if (firstModifier) {
116
				firstModifier = false;
117
			}
118
			buffer.append("enum"); //$NON-NLS-1$
119
		}
55
		}
56
		return firstModifier;
57
	}
58
	
59
	private void decodeModifiersForField(StringBuffer buffer, int accessFlags) {
60
		boolean firstModifier = true;
61
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PUBLIC, "public", firstModifier); //$NON-NLS-1$
62
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PROTECTED, "protected", firstModifier); //$NON-NLS-1$
63
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PRIVATE, "private", firstModifier); //$NON-NLS-1$
64
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_STATIC, "static", firstModifier); //$NON-NLS-1$
65
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_FINAL, "final", firstModifier); //$NON-NLS-1$
66
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_TRANSIENT, "transient", firstModifier); //$NON-NLS-1$
67
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_VOLATILE, "volatile", firstModifier); //$NON-NLS-1$
68
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_ENUM, "enum", firstModifier); //$NON-NLS-1$
120
		if (!firstModifier) {
69
		if (!firstModifier) {
121
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
70
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
122
		}
71
		}
Lines 124-183 Link Here
124
73
125
	private final void decodeModifiersForInnerClasses(StringBuffer buffer, int accessFlags) {
74
	private final void decodeModifiersForInnerClasses(StringBuffer buffer, int accessFlags) {
126
		boolean firstModifier = true;
75
		boolean firstModifier = true;
127
		if ((accessFlags & IModifierConstants.ACC_PUBLIC) != 0) {
76
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PUBLIC, "public", firstModifier); //$NON-NLS-1$
128
			if (!firstModifier) {
77
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PROTECTED, "protected", firstModifier); //$NON-NLS-1$
129
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
78
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PRIVATE, "private", firstModifier); //$NON-NLS-1$
130
			}
79
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_ABSTRACT, "abstract", firstModifier); //$NON-NLS-1$
131
			if (firstModifier) {
80
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_STATIC, "static", firstModifier); //$NON-NLS-1$
132
				firstModifier = false;
81
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_FINAL, "final", firstModifier); //$NON-NLS-1$
133
			}
134
			buffer.append("public"); //$NON-NLS-1$
135
		}
136
		if ((accessFlags & IModifierConstants.ACC_PRIVATE) != 0) {
137
			if (!firstModifier) {
138
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
139
			}
140
			if (firstModifier) {
141
				firstModifier = false;
142
			}
143
			buffer.append("private"); //$NON-NLS-1$
144
		}
145
		if ((accessFlags & IModifierConstants.ACC_PROTECTED) != 0) {
146
			if (!firstModifier) {
147
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
148
			}
149
			if (firstModifier) {
150
				firstModifier = false;
151
			}
152
			buffer.append("protected"); //$NON-NLS-1$
153
		}
154
		if ((accessFlags & IModifierConstants.ACC_STATIC) != 0) {
155
			if (!firstModifier) {
156
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
157
			}
158
			if (firstModifier) {
159
				firstModifier = false;
160
			}
161
			buffer.append("static"); //$NON-NLS-1$
162
		}
163
		if ((accessFlags & IModifierConstants.ACC_FINAL) != 0) {
164
			if (!firstModifier) {
165
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
166
			}
167
			if (firstModifier) {
168
				firstModifier = false;
169
			}
170
			buffer.append("final"); //$NON-NLS-1$
171
		}
172
		if ((accessFlags & IModifierConstants.ACC_ABSTRACT) != 0) {
173
			if (!firstModifier) {
174
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
175
			}
176
			if (firstModifier) {
177
				firstModifier = false;
178
			}
179
			buffer.append("abstract"); //$NON-NLS-1$
180
		}
181
		if (!firstModifier) {
82
		if (!firstModifier) {
182
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
83
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
183
		}
84
		}
Lines 185-280 Link Here
185
86
186
	private final void decodeModifiersForMethod(StringBuffer buffer, int accessFlags) {
87
	private final void decodeModifiersForMethod(StringBuffer buffer, int accessFlags) {
187
		boolean firstModifier = true;
88
		boolean firstModifier = true;
188
		if ((accessFlags & IModifierConstants.ACC_ABSTRACT) != 0) {
89
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PUBLIC, "public", firstModifier); //$NON-NLS-1$
189
			if (!firstModifier) {
90
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PROTECTED, "protected", firstModifier); //$NON-NLS-1$
190
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
91
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PRIVATE, "private", firstModifier); //$NON-NLS-1$
191
			}
92
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_ABSTRACT, "abstract", firstModifier); //$NON-NLS-1$
192
			if (firstModifier) {
93
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_STATIC, "static", firstModifier); //$NON-NLS-1$
193
				firstModifier = false;
94
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_FINAL, "final", firstModifier); //$NON-NLS-1$
194
			}
95
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_SYNCHRONIZED, "synchronized", firstModifier); //$NON-NLS-1$
195
			buffer.append("abstract"); //$NON-NLS-1$
96
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_NATIVE, "native", firstModifier); //$NON-NLS-1$
196
		}
97
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_STRICT, "strictfp", firstModifier); //$NON-NLS-1$
197
		if ((accessFlags & IModifierConstants.ACC_FINAL) != 0) {
98
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_BRIDGE, "bridge", firstModifier); //$NON-NLS-1$
198
			if (!firstModifier) {
199
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
200
			}
201
			if (firstModifier) {
202
				firstModifier = false;
203
			}
204
			buffer.append("final"); //$NON-NLS-1$
205
		}
206
		if ((accessFlags & IModifierConstants.ACC_NATIVE) != 0) {
207
			if (!firstModifier) {
208
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
209
			}
210
			if (firstModifier) {
211
				firstModifier = false;
212
			}
213
			buffer.append("native"); //$NON-NLS-1$
214
		}
215
		if ((accessFlags & IModifierConstants.ACC_PRIVATE) != 0) {
216
			if (!firstModifier) {
217
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
218
			}
219
			if (firstModifier) {
220
				firstModifier = false;
221
			}
222
			buffer.append("private"); //$NON-NLS-1$
223
		}
224
		if ((accessFlags & IModifierConstants.ACC_PROTECTED) != 0) {
225
			if (!firstModifier) {
226
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
227
			}
228
			if (firstModifier) {
229
				firstModifier = false;
230
			}
231
			buffer.append("protected"); //$NON-NLS-1$
232
		}
233
		if ((accessFlags & IModifierConstants.ACC_PUBLIC) != 0) {
234
			if (!firstModifier) {
235
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
236
			}
237
			if (firstModifier) {
238
				firstModifier = false;
239
			}
240
			buffer.append("public"); //$NON-NLS-1$
241
		}
242
		if ((accessFlags & IModifierConstants.ACC_STATIC) != 0) {
243
			if (!firstModifier) {
244
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
245
			}
246
			if (firstModifier) {
247
				firstModifier = false;
248
			}
249
			buffer.append("static"); //$NON-NLS-1$
250
		}
251
		if ((accessFlags & IModifierConstants.ACC_STRICT) != 0) {
252
			if (!firstModifier) {
253
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
254
			}
255
			if (firstModifier) {
256
				firstModifier = false;
257
			}
258
			buffer.append("strictfp"); //$NON-NLS-1$
259
		}
260
		if ((accessFlags & IModifierConstants.ACC_SYNCHRONIZED) != 0) {
261
			if (!firstModifier) {
262
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
263
			}
264
			if (firstModifier) {
265
				firstModifier = false;
266
			}
267
			buffer.append("synchronized"); //$NON-NLS-1$
268
		}
269
		if ((accessFlags & IModifierConstants.ACC_BRIDGE) != 0) {
270
			if (!firstModifier) {
271
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
272
			}
273
			if (firstModifier) {
274
				firstModifier = false;
275
			}
276
			buffer.append("bridge"); //$NON-NLS-1$
277
		}		
278
		if (!firstModifier) {
99
		if (!firstModifier) {
279
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
100
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
280
		}
101
		}
Lines 282-314 Link Here
282
103
283
	private final void decodeModifiersForType(StringBuffer buffer, int accessFlags) {
104
	private final void decodeModifiersForType(StringBuffer buffer, int accessFlags) {
284
		boolean firstModifier = true;
105
		boolean firstModifier = true;
285
		if ((accessFlags & IModifierConstants.ACC_ABSTRACT) != 0) {
106
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_PUBLIC, "public", firstModifier); //$NON-NLS-1$
286
			if (!firstModifier) {
107
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_ABSTRACT, "abstract", firstModifier); //$NON-NLS-1$
287
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
108
		firstModifier = appendModifier(buffer, accessFlags, IModifierConstants.ACC_FINAL, "final", firstModifier); //$NON-NLS-1$
288
			}
289
			if (firstModifier) {
290
				firstModifier = false;
291
			}
292
			buffer.append("abstract"); //$NON-NLS-1$
293
		}
294
		if ((accessFlags & IModifierConstants.ACC_FINAL) != 0) {
295
			if (!firstModifier) {
296
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
297
			}
298
			if (firstModifier) {
299
				firstModifier = false;
300
			}
301
			buffer.append("final"); //$NON-NLS-1$
302
		}
303
		if ((accessFlags & IModifierConstants.ACC_PUBLIC) != 0) {
304
			if (!firstModifier) {
305
				buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
306
			}
307
			if (firstModifier) {
308
				firstModifier = false;
309
			}
310
			buffer.append("public"); //$NON-NLS-1$
311
		}
312
		if (!firstModifier) {
109
		if (!firstModifier) {
313
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
110
			buffer.append(Util.bind("disassembler.space")); //$NON-NLS-1$
314
		}
111
		}

Return to bug 25800