MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (annotations for avoiding pointless 'platform type' warnings)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-10-11 11:11:17 +02:00
parent 0c37a0560a
commit 592e7789a9
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java
+25 -27
View File
@@ -1,24 +1,23 @@
/*
* Copyright 2000-2017 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.
*/
// Copyright 2000-2017 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.ui;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.util.ui.JBUI;
import org.intellij.lang.annotations.JdkConstants;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
@@ -27,29 +26,28 @@ import java.awt.*;
* @author beg
*/
public class ScrollPaneFactory implements ScrollPaneConstants {
private ScrollPaneFactory() {
}
private ScrollPaneFactory() { }
public static JScrollPane createScrollPane() {
public static @NotNull JScrollPane createScrollPane() {
return new JBScrollPane();
}
public static JScrollPane createScrollPane(Component view) {
public static @NotNull JScrollPane createScrollPane(Component view) {
return new JBScrollPane(view);
}
public static JScrollPane createScrollPane(@JdkConstants.VerticalScrollBarPolicy int vsbPolicy,
@JdkConstants.HorizontalScrollBarPolicy int hsbPolicy) {
public static @NotNull JScrollPane createScrollPane(@JdkConstants.VerticalScrollBarPolicy int vsbPolicy,
@JdkConstants.HorizontalScrollBarPolicy int hsbPolicy) {
return new JBScrollPane(vsbPolicy, hsbPolicy);
}
public static JScrollPane createScrollPane(Component view,
@JdkConstants.VerticalScrollBarPolicy int vsbPolicy,
@JdkConstants.HorizontalScrollBarPolicy int hsbPolicy) {
public static @NotNull JScrollPane createScrollPane(Component view,
@JdkConstants.VerticalScrollBarPolicy int vsbPolicy,
@JdkConstants.HorizontalScrollBarPolicy int hsbPolicy) {
return new JBScrollPane(view, vsbPolicy, hsbPolicy);
}
public static JScrollPane createScrollPane(Component view, boolean withoutBorder) {
public static @NotNull JScrollPane createScrollPane(Component view, boolean withoutBorder) {
JBScrollPane scrollPane = new JBScrollPane(view);
if (withoutBorder) {
scrollPane.setBorder(JBUI.Borders.empty()); // set empty border, because setting null doesn't always take effect
@@ -67,9 +65,9 @@ public class ScrollPaneFactory implements ScrollPaneConstants {
*
* @see IdeBorderFactory#createBorder(int)
*/
public static JScrollPane createScrollPane(Component view, @MagicConstant(flagsFromClass = SideBorder.class) int borders) {
public static @NotNull JScrollPane createScrollPane(Component view, @MagicConstant(flagsFromClass = SideBorder.class) int borders) {
JBScrollPane scrollPane = new JBScrollPane(view);
scrollPane.setBorder(IdeBorderFactory.createBorder(borders));
return scrollPane;
}
}
}