From a9ff7993c2f0e3f3412ef68a236aa2eb02385c64 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Wed, 5 Jun 2013 15:15:53 +0300 Subject: Don't use the broken {@value Type#CONSTANT} pattern in javadocs Change-Id: I78f0f6532242bd5d7aa406fe61ccf15d9585fde9 --- client/src/com/vaadin/client/ApplicationConfiguration.java | 10 ++++------ server/src/com/vaadin/server/Constants.java | 1 + server/src/com/vaadin/server/VaadinService.java | 3 +-- server/src/com/vaadin/server/VaadinSession.java | 1 + server/src/com/vaadin/ui/UI.java | 2 +- shared/src/com/vaadin/shared/ApplicationConstants.java | 1 + 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java index 9152e5ab23..a1f2e4f30e 100644 --- a/client/src/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/client/ApplicationConfiguration.java @@ -232,9 +232,8 @@ public class ApplicationConfiguration implements EntryPoint { /** * Checks whether path info in requests to the server-side service should be - * in a request parameter (named - * {@value ApplicationConstants#V_RESOURCE_PATH}) or appended to the end of - * the service URL. + * in a request parameter (named v-resourcePath) or appended to + * the end of the service URL. * * @see #getServiceUrl() * @@ -253,9 +252,8 @@ public class ApplicationConfiguration implements EntryPoint { /** * Gets the URL to the server-side VaadinService. If * {@link #useServiceUrlPathParam()} return true, the requested - * path info should be in the {@value ApplicationConstants#V_RESOURCE_PATH} - * query parameter; else the path info should be appended to the end of the - * URL. + * path info should be in the v-resourcePath query parameter; + * else the path info should be appended to the end of the URL. * * @see #useServiceUrlPathParam() * diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 2c041e3cf8..7d3201efdf 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -116,6 +116,7 @@ public interface Constants { static final String URL_PARAMETER_THEME = "theme"; static final String SERVLET_PARAMETER_PRODUCTION_MODE = "productionMode"; + // Javadocs for VaadinService should be updated if this value is changed static final String SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION = "disable-xsrf-protection"; static final String SERVLET_PARAMETER_RESOURCE_CACHE_TIME = "resourceCacheTime"; static final String SERVLET_PARAMETER_HEARTBEAT_INTERVAL = "heartbeatInterval"; diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java index a040c72175..18dc468cb0 100644 --- a/server/src/com/vaadin/server/VaadinService.java +++ b/server/src/com/vaadin/server/VaadinService.java @@ -1584,8 +1584,7 @@ public abstract class VaadinService implements Serializable { * This protection is enabled by default, but it might need to be disabled * to allow a certain type of testing. For these cases, the check can be * disabled by setting the init parameter - * {@value Constants#SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION} to - * true. + * disable-xsrf-protection to true. * * @see DeploymentConfiguration#isXsrfProtectionEnabled() * diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java index e0a5b51baa..82f245594f 100644 --- a/server/src/com/vaadin/server/VaadinSession.java +++ b/server/src/com/vaadin/server/VaadinSession.java @@ -133,6 +133,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * The name of the parameter that is by default used in e.g. web.xml to * define the name of the default {@link UI} class. */ + // javadoc in UI should be updated if this value is changed public static final String UI_PARAMETER = "UI"; private static final Method BOOTSTRAP_FRAGMENT_METHOD = ReflectTools diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 6159298a69..fa38666dc2 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -74,7 +74,7 @@ import com.vaadin.util.CurrentInstance; * browser window which points to e.g. {@link VaadinServlet}, all * {@link UIProvider}s registered to the current {@link VaadinSession} are * queried for the UI class that should be used. The selection is by defaylt - * based on the {@value VaadinSession#UI_PARAMETER} parameter from web.xml. + * based on the UI init parameter from web.xml. *

*

* After a UI has been created by the application, it is initialized using diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index e51139dac7..15b81cd9a4 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -48,6 +48,7 @@ public class ApplicationConstants implements Serializable { public static final String SERVICE_URL_PATH_AS_PARAMETER = "usePathParameter"; + // Javadocs in ApplicationConfiguration should be updated if this is changed public static final String V_RESOURCE_PATH = "v-resourcePath"; @Deprecated -- cgit v1.2.3 ef22ad7c356bb3970'>refslogtreecommitdiffstats

path: root/test/layoutengine/standard-testcases/markers_7.xml
blob: ef018f2960bb2ecd0b3a1d312475b278bfbf9442 (plain) 
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
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341