44import java .io .IOException ;
55import java .util .Collection ;
66import java .util .Iterator ;
7+ import java .util .LinkedList ;
78import java .util .List ;
89import java .util .StringTokenizer ;
910
1617
1718public class SuppressionProfile implements TableModel <Suppression > {
1819 private static final String DELIMITER = "!" ;
19-
20+
2021 // contains the suppressions per file
21- private final ListMultimap < File , Suppression > suppressionList ;
22+ private final List < Suppression > suppressionList ;
2223 private final IPreferenceStore projectPreferences ;
2324 private final IProject project ;
2425
2526 public SuppressionProfile (IPreferenceStore projectPreferences ,
2627 IProject project ) {
2728 this .projectPreferences = projectPreferences ;
28- this .suppressionList = LinkedListMultimap . create ();
29+ this .suppressionList = new LinkedList < Suppression > ();
2930 this .project = project ;
3031 load ();
3132 }
@@ -47,9 +48,7 @@ private void load() {
4748
4849 public void save () throws IOException {
4950 StringBuffer suppressions = new StringBuffer ();
50- Iterator <?> iterator = suppressionList .values ().iterator ();
51- while (iterator .hasNext ()) {
52- Suppression suppression = (Suppression ) iterator .next ();
51+ for (Suppression suppression : suppressionList ) {
5352 suppressions .append (suppression .serialize ()).append (DELIMITER );
5453 }
5554
@@ -62,7 +61,7 @@ public void save() throws IOException {
6261 }
6362
6463 private void addSuppression (Suppression suppression ) {
65- suppressionList .put ( suppression . getFile ( project ), suppression );
64+ suppressionList .add ( suppression );
6665 }
6766
6867 public Suppression addFileSuppression (File file ) {
@@ -81,7 +80,7 @@ public void addProblemInLineSuppression(File file, String problemId,
8180 }
8281
8382 public void remove (Suppression suppression ) {
84- suppressionList .remove (suppression . getFile ( project ), suppression );
83+ suppressionList .remove (suppression );
8584 }
8685
8786 public void removeAll () {
@@ -96,11 +95,11 @@ private File makeAbsoluteFile(File file) {
9695 }
9796
9897 public boolean isFileSuppressed (File file ) {
99- List <Suppression > suppressions = suppressionList
100- .get (makeAbsoluteFile (file ));
101- for (Suppression suppression : suppressions ) {
102- if (suppression .isFileSuppression ())
98+ File absoluteFile = makeAbsoluteFile (file );
99+ for (Suppression suppression : suppressionList ) {
100+ if (suppression .isSuppression (absoluteFile , project )) {
103101 return true ;
102+ }
104103 }
105104 return false ;
106105 }
@@ -111,28 +110,25 @@ public boolean isProblemInLineSuppressed(File file, String problemId,
111110 if (file == null ) {
112111 return false ;
113112 }
114- List <Suppression > suppressions = suppressionList
115- .get (makeAbsoluteFile (file ));
116- for (Suppression suppression : suppressions ) {
117- if (suppression .isFileSuppression ()) {
118- return true ;
119- }
120- if (suppression .isSuppression (file , problemId , line , project )) {
113+ File absoluteFile = makeAbsoluteFile (file );
114+ for (Suppression suppression : suppressionList ) {
115+ if (suppression .isSuppression (absoluteFile , problemId , line ,
116+ project )) {
121117 return true ;
122118 }
123119 }
124120 return false ;
125121 }
126122
127- public Collection <Suppression > getSuppressions () {
128- return suppressionList . values () ;
123+ public final Collection <Suppression > getSuppressions () {
124+ return suppressionList ;
129125 }
130-
126+
131127 public Iterator <Suppression > iterator () {
132- return suppressionList .values (). iterator ();
128+ return suppressionList .iterator ();
133129 }
134-
130+
135131 public Suppression [] toArray () {
136- return (Suppression []) suppressionList .values (). toArray (new Suppression [0 ]);
132+ return (Suppression []) suppressionList .toArray (new Suppression [0 ]);
137133 }
138134}
0 commit comments