From a7ea60e7185fd57e985ad0fe2f8da1150b7a5afd Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 20 Mar 2015 18:04:16 +0300 Subject: [PATCH] removed redundant suppression --- .../folding/CodeFoldingSettings.java | 25 +++++++++++++++---- .../openapi/fileTypes/CharsetUtil.java | 4 +-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/platform/core-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java b/platform/core-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java index 747d1de5bebb..9fa501f5aa06 100644 --- a/platform/core-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java +++ b/platform/core-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java @@ -1,13 +1,28 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight.folding; import com.intellij.openapi.components.ServiceManager; public class CodeFoldingSettings { - @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_IMPORTS = true; - @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_METHODS = false; - @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_FILE_HEADER = true; - @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_DOC_COMMENTS = false; - @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_CUSTOM_FOLDING_REGIONS = false; + public boolean COLLAPSE_IMPORTS = true; + public boolean COLLAPSE_METHODS = false; + public boolean COLLAPSE_FILE_HEADER = true; + public boolean COLLAPSE_DOC_COMMENTS = false; + public boolean COLLAPSE_CUSTOM_FOLDING_REGIONS = false; public static CodeFoldingSettings getInstance() { return ServiceManager.getService(CodeFoldingSettings.class); diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/CharsetUtil.java b/platform/core-api/src/com/intellij/openapi/fileTypes/CharsetUtil.java index bd69a0d863c3..f826b230f3e9 100644 --- a/platform/core-api/src/com/intellij/openapi/fileTypes/CharsetUtil.java +++ b/platform/core-api/src/com/intellij/openapi/fileTypes/CharsetUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import java.util.Map; * @author peter */ public class CharsetUtil { - @SuppressWarnings("MismatchedQueryAndUpdenateOfCollection") + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private static final Map ourSupportsCharsetDetection = new ConcurrentFactoryMap() { @Nullable @Override