use diamond

This commit is contained in:
2015-07-05 21:34:49 +02:00
parent 8928a3c9ee
commit bf2c6cb822
37 changed files with 160 additions and 158 deletions
@@ -83,7 +83,7 @@ public class Graph {
if (heads != null) {
return;
}
heads = makeGraph(code, new ArrayList<GraphPart>(), alternateEntries);
heads = makeGraph(code, new ArrayList<>(), alternateEntries);
int time = 1;
List<GraphPart> ordered = new ArrayList<>();
List<GraphPart> visited = new ArrayList<>();
@@ -870,7 +870,7 @@ public class Graph {
private void markLevels(String path, BaseLocalData localData, GraphPart part, List<GraphPart> allParts, List<Loop> loops) throws InterruptedException {
clearLoops(loops);
markLevels(path, localData, part, allParts, loops, new ArrayList<GraphPart>(), 1, new ArrayList<GraphPart>(), 0);
markLevels(path, localData, part, allParts, loops, new ArrayList<>(), 1, new ArrayList<>(), 0);
clearLoops(loops);
}
@@ -1021,7 +1021,7 @@ public class Graph {
private void getLoops(BaseLocalData localData, GraphPart part, List<Loop> loops, List<GraphPart> stopPart) throws InterruptedException {
clearLoops(loops);
getLoops(localData, part, loops, stopPart, true, 1, new ArrayList<GraphPart>());
getLoops(localData, part, loops, stopPart, true, 1, new ArrayList<>());
clearLoops(loops);
}
@@ -1841,7 +1841,7 @@ public class Graph {
checkContinueAtTheEnd(finalComm, currentLoop);
}
if (!finalComm.isEmpty()) {
ret.add(index, li = new ForItem(expr.src, currentLoop, new ArrayList<GraphTargetItem>(), exprList.get(exprList.size() - 1), finalComm, commands));
ret.add(index, li = new ForItem(expr.src, currentLoop, new ArrayList<>(), exprList.get(exprList.size() - 1), finalComm, commands));
} else {
ret.add(index, li = new WhileItem(expr.src, currentLoop, exprList, commands));
}
@@ -174,7 +174,7 @@ public class GraphPart implements Serializable {
for (Loop l : loops) {
l.leadsToMark = 0;
}
return leadsTo(localData, gr, code, part, new ArrayList<GraphPart>(), loops);
return leadsTo(localData, gr, code, part, new ArrayList<>(), loops);
}
public GraphPart(int start, int end) {
@@ -279,7 +279,7 @@ public class GraphPart implements Serializable {
}
public boolean containsPart(GraphPart what) {
return containsPart(this, what, new ArrayList<GraphPart>());
return containsPart(this, what, new ArrayList<>());
}
public List<GraphPart> getSubParts() {
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.graph;
import com.jpexs.decompiler.flash.BaseLocalData;
@@ -93,7 +94,7 @@ public abstract class GraphSource implements Serializable {
HashMap<Integer, List<Integer>> refs = new HashMap<>();
int siz = size();
for (int i = 0; i < siz; i++) {
refs.put(i, new ArrayList<Integer>());
refs.put(i, new ArrayList<>());
}
visitCode(0, 0, refs, -1);
int pos = 0;
@@ -47,7 +47,7 @@ public class TypeItem extends GraphTargetItem {
}
public TypeItem(DottedChain fullTypeName) {
this(fullTypeName, new ArrayList<GraphTargetItem>());
this(fullTypeName, new ArrayList<>());
}
public TypeItem(DottedChain fullTypeName, List<GraphTargetItem> subtypes) {