diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java index ea02b3819..70e0935f6 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java @@ -7,9 +7,7 @@ /** * @author Daniel Espendiller * - * @deprecated Use core features */ -@Deprecated public interface GotoCompletionContributor { @Nullable GotoCompletionProvider getProvider(@NotNull PsiElement psiElement); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java index e5d38b29b..dbb15af2e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java @@ -11,9 +11,7 @@ /** * @author Daniel Espendiller * - * @deprecated Use core features */ -@Deprecated public abstract class GotoCompletionProvider implements GotoCompletionProviderInterfaceEx { @NotNull private final PsiElement element; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java index 354b15b33..8d47d4730 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java @@ -4,10 +4,7 @@ /** * @author Daniel Espendiller - * - * @deprecated Use core features */ -@Deprecated public interface GotoCompletionRegistrar { void register(@NotNull GotoCompletionRegistrarParameter registrar); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java index eb6cc0e80..b9f46e60a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java @@ -7,9 +7,7 @@ /** * @author Daniel Espendiller * - * @deprecated Use core features */ -@Deprecated public interface GotoCompletionRegistrarParameter { void register(@NotNull ElementPattern pattern, GotoCompletionContributor contributor); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java index f52294726..1f58c17df 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java @@ -31,7 +31,7 @@ public String getAlias() { } public Collection getPsiTargets() { - return field == null ? Collections.EMPTY_LIST : field.getTargets(); + return field == null ? Collections.emptyList() : field.getTargets(); } @Nullable diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java index 27f4c6d45..4b881beb7 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java @@ -194,6 +194,7 @@ public enum InstanceType { } @Nullable + @SuppressWarnings("unchecked") private static T getLastParentOfType(@Nullable PsiElement element, @NotNull Class aClass) { if (element == null) return null; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java index bf0170839..e4dfdcfd1 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java @@ -45,6 +45,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi } @Override + @SuppressWarnings("deprecation") public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement) throws IncorrectOperationException { YAMLKeyValue serviceKeyValue = YamlHelper.findServiceInContext(psiElement); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java index 73d4d0b1f..641b44ec0 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java @@ -35,6 +35,7 @@ public YamlUpdateArgumentServicesCallback(Project project, YAMLKeyValue argument } @Override + @SuppressWarnings("deprecation") public void insert(List items) { YAMLValue yamlCompoundValue = argumentsKeyValue.getValue(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java index 16108ebc8..0223f79e8 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java @@ -68,6 +68,7 @@ public int getStatusCode() { @Nullable @Override + @SuppressWarnings("unchecked") public T getCollector(Class classFactory) { for (Object collector : collectors) { if(classFactory.isAssignableFrom(collector.getClass())) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java index 1b63b7e7c..46a865983 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java @@ -61,6 +61,7 @@ public int getStatusCode() { } } + @SuppressWarnings("unchecked") public T getCollector(Class classFactory) { for (Object collector : collectors) { if(classFactory.isAssignableFrom(collector.getClass())) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java index 96f735a04..544d80dac 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java @@ -21,6 +21,7 @@ import com.intellij.psi.xml.XmlTag; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; +import com.jetbrains.php.config.PhpLanguageLevel; import com.jetbrains.php.lang.parser.PhpElementTypes; import com.jetbrains.php.lang.psi.PhpFile; import com.jetbrains.php.lang.psi.PhpPsiUtil; @@ -390,7 +391,7 @@ public static PsiElement[] getMethodsOnControllerShortcut(@NotNull Project proje if(controllerServiceAction != null) { return new PsiElement[] {controllerServiceAction.getMethod()}; } - } else if(PhpNameUtil.isValidNamespaceFullName(controllerName, true)) { + } else if(PhpNameUtil.isValidNamespaceFullName(controllerName, true, PhpLanguageLevel.current(project))) { // FooBundle\Controller\BarController (__invoke) Method invoke = PhpElementsUtil.getClassMethod(project, controllerName, "__invoke"); if(invoke != null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java index 002d7cd51..57ea72b76 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java @@ -27,7 +27,8 @@ * @author Daniel Espendiller */ public class TwigPattern { - private static final ElementPattern[] PARAMETER_WHITE_LIST = new ElementPattern[]{ + @SuppressWarnings("unchecked") + private static final ElementPattern[] PARAMETER_WHITE_LIST = new ElementPattern[]{ PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE), PlatformPatterns.psiElement(TwigTokenTypes.NUMBER), @@ -939,12 +940,12 @@ public static ElementPattern getTransDefaultDomainPattern() { * transchoice(2, null, 'bar') */ public static ElementPattern getTransDomainPattern() { - ElementPattern[] whitespace = { + ElementPattern[] whitespace = { PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE) }; - ElementPattern[] placeholder = { + ElementPattern[] placeholder = { PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE), PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER), @@ -1097,7 +1098,9 @@ public static ElementPattern getTwigTypeDocBlockPattern() { patterns.add(PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(s)).withLanguage(TwigLanguage.INSTANCE)); } - return PlatformPatterns.or(patterns.toArray(new ElementPattern[0])); + @SuppressWarnings("unchecked") + final ElementPattern[] array = patterns.toArray(new ElementPattern[0]); + return PlatformPatterns.or(array); } /** @@ -1574,7 +1577,7 @@ public static ElementPattern getVariableTypePattern() { @NotNull public static PsiElementPattern getFirstFunctionParameterAsStringPattern() { // string wrapped elements - ElementPattern[] elementPatterns = { + ElementPattern[] elementPatterns = { PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE), PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.SINGLE_QUOTE), @@ -1592,7 +1595,7 @@ public static PsiElementPattern getFirstFunctionParameterAsStringPattern() { @NotNull public static PsiElementPattern getParameterAsStringPattern() { // string wrapped elements - ElementPattern[] elementPatterns = { + ElementPattern[] elementPatterns = { PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE), PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.SINGLE_QUOTE), diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java index e66d037bd..2585a06eb 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java @@ -34,10 +34,10 @@ public class MethodParameterDialog extends JDialog { private final Project project; - static class ComboBoxRenderer extends ColoredListCellRenderer { + static class ComboBoxRenderer extends ColoredListCellRenderer { @Override - protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { - append((String) value); + protected void customizeCellRenderer(JList list, String value, int index, boolean selected, boolean hasFocus) { + append(value); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java index 7409bc9b9..94f393c26 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java @@ -236,7 +236,7 @@ static public Map> getArrayKeyValueMapWithK continue; } - keys.put(key, new Pair(arrayHashElement.getKey(), arrayHashElement.getValue())); + keys.put(key, new Pair<>(arrayHashElement.getKey(), arrayHashElement.getValue())); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java index ddd77f622..c4e3cd1fb 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java @@ -57,6 +57,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @No return new PsiReference[0]; } + @SuppressWarnings("unchecked") private PsiReference[] getPsiReferenceBase(PsiElement psiElement) { try { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java index 28da3c5e8..30b853a18 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java @@ -158,6 +158,7 @@ public static int getParameterIndexValue(@Nullable PsiElement parameterListChild } @Nullable + @SuppressWarnings("unchecked") public static T getNextSiblingOfType(@Nullable PsiElement sibling, ElementPattern pattern) { if (sibling == null) return null; for (PsiElement child = sibling.getNextSibling(); child != null; child = child.getNextSibling()) { @@ -170,6 +171,7 @@ public static T getNextSiblingOfType(@Nullable PsiElement } @NotNull + @SuppressWarnings("unchecked") public static Collection getNextSiblingOfTypes(@Nullable PsiElement sibling, ElementPattern pattern) { if (sibling == null) return Collections.emptySet(); @@ -184,6 +186,7 @@ public static Collection getNextSiblingOfTypes(@Nullab } @NotNull + @SuppressWarnings("unchecked") public static Collection getNextSiblingOfTypes(@Nullable PsiElement sibling, Class pattern) { if (sibling == null) return Collections.emptySet(); @@ -199,6 +202,7 @@ public static Collection getNextSiblingOfTypes(@Nullab } @Nullable + @SuppressWarnings("unchecked") public static T getPrevSiblingOfType(@Nullable PsiElement sibling, ElementPattern pattern) { if (sibling == null) return null; for (PsiElement child = sibling.getPrevSibling(); child != null; child = child.getPrevSibling()) { @@ -221,6 +225,7 @@ public static void getPrevSiblingOnCallback(@Nullable PsiElement sibling, Proces } @Nullable + @SuppressWarnings("unchecked") public static T getChildrenOfType(@Nullable PsiElement element, ElementPattern pattern) { if (element == null) return null; @@ -235,6 +240,7 @@ public static T getChildrenOfType(@Nullable PsiElement el } @NotNull + @SuppressWarnings("unchecked") public static Collection getChildrenOfTypeAsList(@Nullable PsiElement element, ElementPattern pattern) { Collection collection = new ArrayList<>(); @@ -353,6 +359,7 @@ public static PsiElement getParentOfType(@Nullable PsiElement element, @NotNull return null; } + @SuppressWarnings("unchecked") public static List getPrevSiblingsOfType(@Nullable PsiElement sibling, ElementPattern pattern) { List elements = new ArrayList<>(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java index bff1e2a4f..19f55b1dc 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java @@ -18,12 +18,14 @@ public static boolean isNotNullAndIsElementType(@Nullable PsiElement psiElement, } @Nullable + @SuppressWarnings("unchecked") public static T getParentOfTypeOrNull(@NotNull PsiElement element, @NotNull Class aClass) { PsiElement parent = element.getParent(); return aClass.isInstance(parent) ? (T) parent : null; } @Nullable + @SuppressWarnings("unchecked") public static T getParentOfTypeWithNameOrNull(@NotNull PsiElement element, @NotNull Class aClass, @NotNull String name) { PsiElement parent = element.getParent(); if(!aClass.isInstance(parent) || !(parent instanceof PsiNamedElement) || !name.equals(((PsiNamedElement) parent).getName())) { @@ -34,6 +36,7 @@ public static T getParentOfTypeWithNameOrNull(@NotNu } @Nullable + @SuppressWarnings("unchecked") public static T getInstanceOfOrNull(@Nullable PsiElement element, @NotNull Class aClass) { if(element == null) return null; return aClass.isInstance(element) ? (T) element : null; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java index bae4f697e..18b91b688 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java @@ -64,6 +64,7 @@ private boolean isModified(Collection serviceFiles) { } @Nullable + @SuppressWarnings("unchecked") synchronized public T parser(Class serviceParser) { Collection settingsServiceFiles = Symfony2ProjectComponent.getContainerFiles(this.project); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java index 5113f8327..11f477995 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java @@ -14,6 +14,7 @@ */ public class YamlPsiElementFactory { @Nullable + @SuppressWarnings("unchecked") public static T createFromText(@NotNull Project p, final Class aClass, String text) { final PsiElement[] ret = new PsiElement[]{null}; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java index 4bb0a1096..73eed5189 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java @@ -45,6 +45,7 @@ public synchronized static RemoteFileStorageInterface[] getExtension(@NotNull Pr } @Nullable + @SuppressWarnings("unchecked") public static T getExtensionInstance(@Nullable Project project, @NotNull Class aClass) { if(!STORAGE_INSTANCES.containsKey(project)) { return null; @@ -59,6 +60,7 @@ public static T getExtensionInstance(@Nullable Project project, @NotNull Cla return null; } + @SuppressWarnings("unchecked") public static void collectRemoteFiles(final @NotNull Project project) { WebServerConfig defaultServer = findDefaultServer(project); if(defaultServer == null) {