From eea2a26c2aae8ec2e269cbaba1bec8544cd37971 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Feb 2012 19:36:06 +0100 Subject: [PATCH] cleanup --- .../src/com/intellij/ui/tabs/impl/LayoutPassInfo.java | 11 ++++++++--- .../intellij/ui/tabs/impl/table/TablePassInfo.java | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java index 8f9e657350fb..7dd868299501 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -16,6 +16,7 @@ package com.intellij.ui.tabs.impl; import com.intellij.ui.tabs.TabInfo; +import org.jetbrains.annotations.Nullable; import java.awt.*; import java.util.List; @@ -28,15 +29,19 @@ public abstract class LayoutPassInfo { myVisibleInfos = visibleInfos; } + @Nullable public abstract TabInfo getPreviousFor(TabInfo info); + @Nullable public abstract TabInfo getNextFor(TabInfo info); - public TabInfo getPrevious(List list, int i) { + @Nullable + public static TabInfo getPrevious(List list, int i) { return i > 0 ? list.get(i - 1) : null; } - public TabInfo getNext(List list, int i) { + @Nullable + public static TabInfo getNext(List list, int i) { return i < list.size() - 1 ? list.get(i + 1) : null; } diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TablePassInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TablePassInfo.java index b2abc5056845..d29ced04e289 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TablePassInfo.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TablePassInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -18,6 +18,7 @@ package com.intellij.ui.tabs.impl.table; import com.intellij.ui.tabs.TabInfo; import com.intellij.ui.tabs.impl.JBTabsImpl; import com.intellij.ui.tabs.impl.LayoutPassInfo; +import org.jetbrains.annotations.Nullable; import java.awt.*; import java.util.ArrayList; @@ -36,16 +37,18 @@ public class TablePassInfo extends LayoutPassInfo { JBTabsImpl myTabs; - TablePassInfo(final JBTabsImpl tabs, java.util.List visibleInfos) { + TablePassInfo(final JBTabsImpl tabs, List visibleInfos) { super(visibleInfos); myTabs = tabs; } + @Nullable public TabInfo getPreviousFor(final TabInfo info) { final TableRow row = myInfo2Row.get(info); return row != null ? getPrevious(row.myColumns, row.myColumns.indexOf(info)) : null; } + @Nullable public TabInfo getNextFor(final TabInfo info) { final TableRow row = myInfo2Row.get(info); return row != null ? getNext(row.myColumns, row.myColumns.indexOf(info)) : null;