cleanup redundant type arguments

java/compiler/impl/src/com/intellij/compiler/impl/TreeBasedMap.java

@@ -15,8 +15,8 @@
  */
 package com.intellij.compiler.impl;
 
-import com.intellij.util.containers.StringInterner;
 import com.intellij.util.containers.EmptyIterator;
+import com.intellij.util.containers.StringInterner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -183,7 +183,7 @@ public class TreeBasedMap<T> {
       final HashMap<String, Node<T>> childrenMap = node.myChildren;
       final boolean hasChildren = childrenMap != null && childrenMap.size() > 0;
       if (hasChildren || node.mappingExists()) {
-        myCurrentNodePath.push(new PathElement<>(node, hasChildren ? childrenMap.keySet().iterator() : EmptyIterator.<String>getInstance()));
+        myCurrentNodePath.push(new PathElement<>(node, hasChildren ? childrenMap.keySet().iterator() : EmptyIterator.getInstance()));
         if (myCurrentNodePath.size() > 2) {
           // do not add separator before the Root and its direct child nodes 
           myCurrentName.append(mySeparator);

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java

@@ -57,6 +57,6 @@ public class EclipseCompiler implements BackendCompiler {
   @NotNull
   @Override
   public Set<FileType> getCompilableFileTypes() {
-    return Collections.<FileType>singleton(StdFileTypes.JAVA);
+    return Collections.singleton(StdFileTypes.JAVA);
   }
 }

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java

@@ -53,6 +53,6 @@ public class JavacCompiler implements BackendCompiler {
 
   @NotNull 
   public Set<FileType> getCompilableFileTypes() {
-    return Collections.<FileType>singleton(StdFileTypes.JAVA);
+    return Collections.singleton(StdFileTypes.JAVA);
   }
 }

java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactBySourceFileFinderImpl.java

@@ -111,6 +111,6 @@ public class ArtifactBySourceFileFinderImpl extends ArtifactBySourceFileFinder {
       }
       file = file.getParent();
     }
-    return result != null ? result : Collections.<Artifact>emptyList();
+    return result != null ? result : Collections.emptyList();
   }
 }

java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java

@@ -451,7 +451,7 @@ public class ArtifactUtil {
                                        @NotNull PackagingElementResolvingContext context,
                                        @NotNull ParentElementProcessor processor,
                                        int maxLevel) {
-    return processParents(artifact, context, processor, FList.<Pair<Artifact, CompositePackagingElement<?>>>emptyList(), maxLevel,
+    return processParents(artifact, context, processor, FList.emptyList(), maxLevel,
                           new THashSet<>());
   }
 

java/compiler/openapi/src/com/intellij/openapi/compiler/CompilationException.java

@@ -72,7 +72,7 @@ public class CompilationException extends Exception {
   }
 
   public CompilationException(String message) {
-    this(message, Collections.<Message>emptyList());
+    this(message, Collections.emptyList());
   }
 
   public CompilationException(String message, Collection<Message> messages) {

java/idea-ui/src/com/intellij/ide/util/importProject/FrameworkDetectionInWizardContext.java

@@ -62,7 +62,7 @@ public abstract class FrameworkDetectionInWizardContext extends FrameworkDetecti
       }
 
       final List<Pair<C, Collection<VirtualFile>>> pairs =
-        detector.createConfigurations(filesByModule.get(module), Collections.<C>emptyList());
+        detector.createConfigurations(filesByModule.get(module), Collections.emptyList());
       for (Pair<C, Collection<VirtualFile>> pair : pairs) {
         result.add(new FacetBasedDetectedFrameworkDescriptionInWizard<>(module, detector, pair.getFirst(),
                                                                         new HashSet<>(pair.getSecond())));

java/idea-ui/src/com/intellij/ide/util/importProject/LibrariesLayoutPanel.java

@@ -40,7 +40,7 @@ public class LibrariesLayoutPanel extends ProjectLayoutPanel<LibraryDescriptor>{
 
   protected List<LibraryDescriptor> getEntries() {
     final List<LibraryDescriptor> libs = getInsight().getSuggestedLibraries();
-    return libs != null? libs : Collections.<LibraryDescriptor>emptyList();
+    return libs != null? libs : Collections.emptyList();
   }
 
   protected Collection getDependencies(final LibraryDescriptor entry) {

java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java

@@ -60,7 +60,7 @@ public abstract class ModuleInsight {
     myExistingModuleNames = existingModuleNames;
     myExistingProjectLibraryNames = existingProjectLibraryNames;
     myProgress = new ProgressIndicatorWrapper(progress);
-    setRoots(Collections.<File>emptyList(), Collections.<DetectedSourceRoot>emptyList(), Collections.<String>emptySet());
+    setRoots(Collections.emptyList(), Collections.emptyList(), Collections.emptySet());
   }
 
   public final void setRoots(final List<File> contentRoots, final List<? extends DetectedSourceRoot> sourceRoots, final Set<String> ignoredNames) {

java/idea-ui/src/com/intellij/ide/util/importProject/ModulesDetectionStep.java

@@ -104,7 +104,7 @@ public class ModulesDetectionStep extends AbstractStepWithProgress<List<ModuleDe
   protected List<ModuleDescriptor> calculate() {
     myInsight.scanModules();
     final List<ModuleDescriptor> suggestedModules = myInsight.getSuggestedModules();
-    return suggestedModules != null? suggestedModules : Collections.<ModuleDescriptor>emptyList();
+    return suggestedModules != null? suggestedModules : Collections.emptyList();
   }
 
   @Override

java/idea-ui/src/com/intellij/ide/util/importProject/ModulesLayoutPanel.java

@@ -48,7 +48,7 @@ public class ModulesLayoutPanel extends ProjectLayoutPanel<ModuleDescriptor>{
 
   protected List<ModuleDescriptor> getEntries() {
     final List<ModuleDescriptor> modules = getInsight().getSuggestedModules();
-    return modules != null? modules : Collections.<ModuleDescriptor>emptyList();
+    return modules != null? modules : Collections.emptyList();
   }
 
   protected Collection getDependencies(final ModuleDescriptor entry) {

java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java

@@ -140,7 +140,7 @@ public class AddSupportForFrameworksPanel implements Disposable {
   }
 
   public void setProviders(List<FrameworkSupportInModuleProvider> providers) {
-    setProviders(providers, Collections.<String>emptySet(), Collections.<String>emptySet());
+    setProviders(providers, Collections.emptySet(), Collections.emptySet());
   }
 
   public void setProviders(List<FrameworkSupportInModuleProvider> providers, Set<String> associated, Set<String> preselected) {

java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNodeBase.java

@@ -81,7 +81,7 @@ public abstract class FrameworkSupportNodeBase<T extends FrameworkOrGroup> exten
 
   @NotNull
   public List<FrameworkSupportNodeBase> getChildren() {
-    return children != null ? (List)children : Collections.<FrameworkSupportNodeBase>emptyList();
+    return children != null ? (List)children : Collections.emptyList();
   }
 
   public FrameworkSupportNodeBase getParentNode() {

java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java

@@ -98,7 +98,7 @@ public class JavaSettingsStep extends SdkSettingsStep {
         }
       }
       else {
-        ((JavaModuleBuilder)myModuleBuilder).setSourcePaths(Collections.<Pair<String,String>>emptyList());
+        ((JavaModuleBuilder)myModuleBuilder).setSourcePaths(Collections.emptyList());
       }
     }
   }

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/GeneralProjectSettingsElement.java

@@ -30,7 +30,10 @@ import com.intellij.util.Chunk;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author nik
@@ -104,7 +107,7 @@ public class GeneralProjectSettingsElement extends ProjectStructureElement {
       problemsHolder.registerProblem(new ProjectStructureProblemDescription(message, description, place,
                                                                             ProjectStructureProblemType
                                                                               .warning("module-circular-dependency"),
-                                                                            Collections.<ConfigurationErrorQuickFix>emptyList()));
+                                                                            Collections.emptyList()));
     }
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java

@@ -169,7 +169,7 @@ public class ProjectJdksConfigurable extends MasterDetailsComponent {
       selectNodeInTree(findNodeByObject(myRoot, projectJdk));
     });
     actions.add(new MyActionGroupWrapper(group));
-    actions.add(new MyDeleteAction(Conditions.<Object[]>alwaysTrue()));
+    actions.add(new MyDeleteAction(Conditions.alwaysTrue()));
     return actions;
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactRootNode.java

@@ -28,7 +28,7 @@ import java.util.Collections;
 public class ArtifactRootNode extends CompositePackagingElementNode {
   public ArtifactRootNode(ArtifactEditorEx artifactEditor, ArtifactEditorContext context,
                           ComplexElementSubstitutionParameters substitutionParameters, ArtifactType artifactType) {
-    super(artifactEditor.getRootElement(), context, null, null, substitutionParameters, Collections.<PackagingNodeSource>emptyList(),
+    super(artifactEditor.getRootElement(), context, null, null, substitutionParameters, Collections.emptyList(),
           artifactType);
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingElementNode.java

@@ -142,7 +142,7 @@ public class PackagingElementNode<E extends PackagingElement<?>> extends Artifac
   @NotNull
   public Collection<PackagingNodeSource> getNodeSource(@NotNull PackagingElement<?> element) {
     final Collection<PackagingNodeSource> nodeSources = myNodeSources.get(element);
-    return nodeSources != null ? nodeSources : Collections.<PackagingNodeSource>emptyList();
+    return nodeSources != null ? nodeSources : Collections.emptyList();
   }
 
   public ArtifactEditorContext getContext() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java

@@ -140,7 +140,7 @@ class ClasspathTableModel extends ListTableModel<ClasspathTableItem<?>> implemen
   }
 
   public void clear() {
-    setItems(Collections.<ClasspathTableItem<?>>emptyList());
+    setItems(Collections.emptyList());
   }
 
   private List<OrderEntry> getEntries() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ProjectStructureChooseLibrariesDialog.java

@@ -70,7 +70,7 @@ public class ProjectStructureChooseLibrariesDialog extends ChooseLibrariesFromTa
   @Override
   public void doCancelAction() {
     super.doCancelAction();
-    removeCreatedModuleLibraries(Collections.<Library>emptyList());
+    removeCreatedModuleLibraries(Collections.emptyList());
   }
 
   private void removeCreatedModuleLibraries(Collection<Library> selected) {