Skip to content

Commit bef09db

Browse files
ahornaceVladimir Kotal
authored andcommitted
Replace deprecated <tt> tag
1 parent a04e70f commit bef09db

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

src/org/opensolaris/opengrok/search/Results.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
2323
* Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
2424
*/
@@ -229,7 +229,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
229229
out.write(">");
230230
out.write(htmlize(rpath.substring(rpath.lastIndexOf('/') + 1)));
231231
out.write("</a>");
232-
out.write("</td><td><tt class=\"con\">");
232+
out.write("</td><td><code class=\"con\">");
233233
if (sh.sourceContext != null) {
234234
Genre genre = Genre.get(doc.get("t"));
235235
if (Genre.XREFABLE == genre && sh.summarizer != null) {
@@ -250,7 +250,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
250250
sh.historyContext.getContext(new File(sh.sourceRoot, rpath),
251251
rpath, out, sh.contextPath);
252252
}
253-
out.write("</tt></td></tr>\n");
253+
out.write("</code></td></tr>\n");
254254
}
255255
}
256256
}

src/org/opensolaris/opengrok/util/BlockingObjectPool.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ public interface BlockingObjectPool<T> extends ObjectPool<T> {
4242
* from implementation to implementation.
4343
*
4444
* @param time amount of time to wait before giving up,
45-
* in units of <tt>unit</tt>
46-
* @param unit a <tt>TimeUnit</tt> determining
47-
* how to interpret the
48-
* <tt>timeout</tt> parameter
45+
* in units of {@code unit}
46+
* @param unit a {@code TimeUnit} determining
47+
* how to interpret the {@code timeout} parameter
4948
* @return T an instance of the Object
5049
* of type T from the pool.
5150
* @throws InterruptedException

src/org/opensolaris/opengrok/web/DirectoryListing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
2323
* Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
2424
*/
@@ -182,7 +182,7 @@ public List<String> extraListTo(String contextPath, File dir, Writer out,
182182
out.write("<th>#Lines</th>\n");
183183
out.write("<th>LOC</th>\n");
184184
if (offset > 0) {
185-
out.write("<th><tt>Description</tt></th>\n");
185+
out.write("<th><samp>Description</samp></th>\n");
186186
}
187187
out.write("</tr>\n</thead>\n<tbody>\n");
188188
RuntimeEnvironment env = RuntimeEnvironment.getInstance();

src/org/opensolaris/opengrok/web/Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
2323
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
2424
*/
@@ -582,7 +582,7 @@ private static String[] normalize(String[] names, boolean canonical) {
582582
* it is a character that has a special meaning in a regexp.
583583
*
584584
* @param c the character that the regexp should match
585-
* @return a six-character string on the form <tt>&#92;u</tt><i>hhhh</i>
585+
* @return a six-character string in the form of <code>&#92;u</code><i>hhhh</i>
586586
*/
587587
private static String escapeForRegex(char c) {
588588
StringBuilder sb = new StringBuilder(6);

web/default/style.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ a:active, a:hover {
3838
text-decoration: underline;
3939
}
4040

41-
img, tt, form, pre {
41+
img, form, pre, code, samp {
4242
border: 0;
4343
}
4444

@@ -300,9 +300,6 @@ html.diff #whole_header {
300300
margin-right: 1ex;
301301
}
302302

303-
#Masthead tt { /* slashes in the xref: line */
304-
}
305-
306303
#sbar, #bar { /* default navbar */
307304
border-top: 4px solid #ffc726;
308305
margin: 0;

web/status.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2424
@@ -70,8 +70,8 @@ internal settings on your OpenGrok server.</p><%
7070
} else {
7171
%><p>
7272
For security reasons, printing of internal settings is not enabled by
73-
default. To enable, set the property <tt>chattyStatusPage</tt> to
74-
<tt>true</tt> in <tt>configuration.xml</tt>.</p><%
73+
default. To enable, set the property <code>chattyStatusPage</code> to
74+
<code>true</code> in <code>configuration.xml</code>.</p><%
7575
}
7676
%>
7777
</div>

0 commit comments

Comments
 (0)