Skip to content

Commit 6d3e641

Browse files
committed
PDFBOX-5660: refactor, as suggested by Valery Bokov; closes #246
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1928466 13f79535-47bb-0310-9956-ffa450edef68
1 parent 79ff64c commit 6d3e641

File tree

1 file changed

+13
-29
lines changed
  • pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure

1 file changed

+13
-29
lines changed

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/Revisions.java

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,16 @@
2828
*/
2929
public class Revisions<T>
3030
{
31-
private List<T> objects;
32-
private List<Integer> revisionNumbers;
31+
private final List<T> objects;
32+
private final List<Integer> revisionNumbers;
3333

3434
/**
3535
* Constructor.
3636
*/
3737
public Revisions()
3838
{
39-
}
40-
41-
private List<T> getObjects()
42-
{
43-
if (this.objects == null)
44-
{
45-
this.objects = new ArrayList<>();
46-
}
47-
return this.objects;
48-
}
49-
50-
private List<Integer> getRevisionNumbers()
51-
{
52-
if (this.revisionNumbers == null)
53-
{
54-
this.revisionNumbers = new ArrayList<>();
55-
}
56-
return this.revisionNumbers;
39+
objects = new ArrayList<>();
40+
revisionNumbers = new ArrayList<>();
5741
}
5842

5943
/**
@@ -65,7 +49,7 @@ private List<Integer> getRevisionNumbers()
6549
*/
6650
public T getObject(int index)
6751
{
68-
return this.getObjects().get(index);
52+
return objects.get(index);
6953
}
7054

7155
/**
@@ -77,7 +61,7 @@ public T getObject(int index)
7761
*/
7862
public int getRevisionNumber(int index)
7963
{
80-
return this.getRevisionNumbers().get(index);
64+
return revisionNumbers.get(index);
8165
}
8266

8367
/**
@@ -88,8 +72,8 @@ public int getRevisionNumber(int index)
8872
*/
8973
public void addObject(T object, int revisionNumber)
9074
{
91-
this.getObjects().add(object);
92-
this.getRevisionNumbers().add(revisionNumber);
75+
objects.add(object);
76+
revisionNumbers.add(revisionNumber);
9377
}
9478

9579
/**
@@ -100,10 +84,10 @@ public void addObject(T object, int revisionNumber)
10084
*/
10185
protected void setRevisionNumber(T object, int revisionNumber)
10286
{
103-
int index = this.getObjects().indexOf(object);
87+
int index = objects.indexOf(object);
10488
if (index > -1)
10589
{
106-
this.getRevisionNumbers().set(index, revisionNumber);
90+
revisionNumbers.set(index, revisionNumber);
10791
}
10892
}
10993

@@ -114,7 +98,7 @@ protected void setRevisionNumber(T object, int revisionNumber)
11498
*/
11599
public int size()
116100
{
117-
return this.getObjects().size();
101+
return objects.size();
118102
}
119103

120104
/**
@@ -124,9 +108,9 @@ public int size()
124108
public String toString()
125109
{
126110
StringJoiner sj = new StringJoiner("; ", "{", "}");
127-
for (int i = 0; i < this.getObjects().size(); i++)
111+
for (int i = 0; i < objects.size(); i++)
128112
{
129-
sj.add("object=" + this.getObjects().get(i) + ", revisionNumber=" + this.getRevisionNumber(i));
113+
sj.add("object=" + objects.get(i) + ", revisionNumber=" + getRevisionNumber(i));
130114
}
131115
return sj.toString();
132116
}

0 commit comments

Comments
 (0)