tmf: Switch tmf.ui to Java 7 + fix warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / project / wizards / importtrace / ImportTraceContentProvider.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java
index 3870c4dd9453dbea49a4fd06634e2512f52d9b29..c3fb61bf5016b86301b4d3c50083bee540b40710 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java
@@ -35,8 +35,8 @@ import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType;
  */
 class ImportTraceContentProvider implements ITreeContentProvider {
 
-    private final Map<String, String> fTraceTypes = new HashMap<String, String>();
-    private final Map<String, Set<FileAndName>> fTraceFiles = new HashMap<String, Set<FileAndName>>();
+    private final Map<String, String> fTraceTypes = new HashMap<>();
+    private final Map<String, Set<FileAndName>> fTraceFiles = new HashMap<>();
     private final List<String> fTraceTypesToScan;
     private final Set<String> fParentFilesToScan;
 
@@ -91,7 +91,7 @@ class ImportTraceContentProvider implements ITreeContentProvider {
 
     @Override
     public synchronized Object[] getElements(Object inputElement) {
-        List<String> candidates = new ArrayList<String>();
+        List<String> candidates = new ArrayList<>();
 
         for (String candidate : fTraceTypesToScan) {
             for (Entry<String, String> entry : fTraceTypes.entrySet()) {
@@ -110,7 +110,7 @@ class ImportTraceContentProvider implements ITreeContentProvider {
         if (parentElement instanceof String) {
             final Set<FileAndName> children = fTraceFiles.get(fTraceTypes.get(parentElement));
             if (children != null) {
-                Set<FileAndName> candidates = new TreeSet<FileAndName>();
+                Set<FileAndName> candidates = new TreeSet<>();
                 for (FileAndName child : children) {
                     for (String parent : fParentFilesToScan) {
                         // this is going to be slow, but less slow than UI