Skip to content

Commit 382491c

Browse files
elharoelharo
authored
fill in some generic types (#66)
1 parent 80e16ac commit 382491c

File tree

2 files changed

+30
-33
lines changed

2 files changed

+30
-33
lines changed

‎doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java

+28-31
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public class RtfSink
177177

178178
private int charSet = DEFAULT_CHAR_SET;
179179

180-
private final Hashtable fontTable;
180+
private final Hashtable<String, Font> fontTable;
181181

182182
private Context context;
183183

@@ -189,9 +189,9 @@ public class RtfSink
189189

190190
private int listItemIndent;
191191

192-
private final Vector numbering;
192+
private final Vector<Integer> numbering;
193193

194-
private final Vector itemNumber;
194+
private final Vector<Counter> itemNumber;
195195

196196
private int style = STYLE_ROMAN;
197197

@@ -220,7 +220,7 @@ public class RtfSink
220220

221221
/** Map of warn messages with a String as key to describe the error type and a Set as value.
222222
* Using to reduce warn messages. */
223-
private Map warnMessages;
223+
private Map<String, Set<String>> warnMessages;
224224

225225
// -----------------------------------------------------------------------
226226

@@ -252,14 +252,14 @@ protected RtfSink( OutputStream output )
252252
*
253253
* @param output not null
254254
* @param encoding a valid charset
255-
* @throws java.io.IOException if any.
255+
* @throws java.io.IOException if any
256256
*/
257257
protected RtfSink( OutputStream output, String encoding )
258258
throws IOException
259259
{
260-
this.fontTable = new Hashtable();
261-
this.numbering = new Vector();
262-
this.itemNumber = new Vector();
260+
this.fontTable = new Hashtable<>();
261+
this.numbering = new Vector<>();
262+
this.itemNumber = new Vector<>();
263263

264264
Writer w;
265265
this.stream = new BufferedOutputStream( output );
@@ -1351,7 +1351,7 @@ private void writeImage( String source )
13511351
bytesPerLine = 4 * ( ( srcWidth + 3 ) / 4 );
13521352
byte[] bitmap = new byte[srcHeight * bytesPerLine];
13531353

1354-
Vector colors = new Vector( 256 );
1354+
Vector<Color> colors = new Vector<>( 256 );
13551355
colors.addElement( Color.white );
13561356
colors.addElement( Color.black );
13571357

@@ -1920,16 +1920,13 @@ public void close()
19201920

19211921
if ( getLog().isWarnEnabled() && this.warnMessages != null )
19221922
{
1923-
for ( Object o1 : this.warnMessages.entrySet() )
1923+
for ( Map.Entry<String, Set<String>> entry : this.warnMessages.entrySet() )
19241924
{
1925-
Map.Entry entry = (Map.Entry) o1;
19261925

1927-
Set set = (Set) entry.getValue();
1926+
Set<String> set = entry.getValue();
19281927

1929-
for ( Object o : set )
1928+
for ( String msg : set )
19301929
{
1931-
String msg = (String) o;
1932-
19331930
getLog().warn( msg );
19341931
}
19351932
}
@@ -1960,13 +1957,13 @@ private void logMessage( String key, String msg )
19601957

19611958
if ( warnMessages == null )
19621959
{
1963-
warnMessages = new HashMap();
1960+
warnMessages = new HashMap<>();
19641961
}
19651962

1966-
Set set = (Set) warnMessages.get( key );
1963+
Set<String> set = warnMessages.get( key );
19671964
if ( set == null )
19681965
{
1969-
set = new TreeSet();
1966+
set = new TreeSet<>();
19701967
}
19711968
set.add( msg );
19721969
warnMessages.put( key, set );
@@ -2039,7 +2036,7 @@ static class Context
20392036
{
20402037
private int context = CONTEXT_UNDEFINED;
20412038

2042-
private Vector stack = new Vector();
2039+
private Vector<Integer> stack = new Vector<>();
20432040

20442041
void set( int context )
20452042
{
@@ -2051,7 +2048,7 @@ void restore()
20512048
{
20522049
if ( !stack.isEmpty() )
20532050
{
2054-
context = (Integer) stack.lastElement();
2051+
context = stack.lastElement();
20552052
stack.removeElementAt( stack.size() - 1 );
20562053
}
20572054
}
@@ -2172,7 +2169,7 @@ class Space
21722169

21732170
private int next;
21742171

2175-
private Vector stack = new Vector();
2172+
private Vector<Integer> stack = new Vector<>();
21762173

21772174
Space( int space /*twips*/ )
21782175
{
@@ -2196,7 +2193,7 @@ void restore()
21962193
{
21972194
if ( !stack.isEmpty() )
21982195
{
2199-
space = (Integer) stack.lastElement();
2196+
space = stack.lastElement();
22002197
stack.removeElementAt( stack.size() - 1 );
22012198
next = space;
22022199
}
@@ -2234,7 +2231,7 @@ static class Indentation
22342231
{
22352232
private int indent;
22362233

2237-
private Vector stack = new Vector();
2234+
private Vector<Integer> stack = new Vector<>();
22382235

22392236
Indentation( int indent /*twips*/ )
22402237
{
@@ -2256,7 +2253,7 @@ void restore()
22562253
{
22572254
if ( !stack.isEmpty() )
22582255
{
2259-
indent = (Integer) stack.lastElement();
2256+
indent = stack.lastElement();
22602257
stack.removeElementAt( stack.size() - 1 );
22612258
}
22622259
}
@@ -2277,15 +2274,15 @@ static class Table
22772274

22782275
boolean grid;
22792276

2280-
Vector rows;
2277+
Vector<Row> rows;
22812278

22822279
Table( int[] justification, boolean grid )
22832280
{
22842281
numColumns = justification.length;
22852282
columnWidths = new int[numColumns];
22862283
this.justification = justification;
22872284
this.grid = grid;
2288-
rows = new Vector();
2285+
rows = new Vector<>();
22892286
}
22902287

22912288
void add( Row row )
@@ -2298,7 +2295,7 @@ void add( Row row )
22982295
{
22992296
break;
23002297
}
2301-
Cell cell = (Cell) row.cells.elementAt( i );
2298+
Cell cell = row.cells.elementAt( i );
23022299
int width = cell.boundingBox().width;
23032300
if ( width > columnWidths[i] )
23042301
{
@@ -2324,7 +2321,7 @@ int width()
23242321

23252322
static class Row
23262323
{
2327-
Vector cells = new Vector();
2324+
Vector<Cell> cells = new Vector<>();
23282325

23292326
void add( Cell cell )
23302327
{
@@ -2337,7 +2334,7 @@ int height()
23372334
int numCells = cells.size();
23382335
for ( int i = 0; i < numCells; ++i )
23392336
{
2340-
Cell cell = (Cell) cells.elementAt( i );
2337+
Cell cell = cells.elementAt( i );
23412338
Box box = cell.boundingBox();
23422339
if ( box.height > height )
23432340
{
@@ -2350,7 +2347,7 @@ int height()
23502347

23512348
class Cell
23522349
{
2353-
Vector lines = new Vector();
2350+
Vector<Line> lines = new Vector<>();
23542351

23552352
void add( Line line )
23562353
{
@@ -2403,7 +2400,7 @@ Box boundingBox()
24032400

24042401
static class Line
24052402
{
2406-
Vector items = new Vector();
2403+
Vector<Item> items = new Vector<>();
24072404

24082405
void add( Item item )
24092406
{

‎doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class WMFWriter
5757

5858
private short numOfParams;
5959

60-
private Vector records;
60+
private Vector<Record> records;
6161

6262
WMFWriter()
6363
{
@@ -69,7 +69,7 @@ class WMFWriter
6969
maxRecordSize = trailer.size();
7070
numOfParams = 0;
7171

72-
records = new Vector();
72+
records = new Vector<>();
7373
}
7474

7575
void add( Record record )

0 commit comments

Comments
 (0)