From d2c5a78a9d73b9b5ff7427bbc28c94ae9968358e Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 4 Dec 2017 18:33:50 +0300 Subject: [PATCH] add helpId getter and setter to Tool Window content --- .../src/com/intellij/ui/content/Content.java | 21 ++++++--------- .../intellij/ui/content/impl/ContentImpl.java | 26 +++++++++---------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/content/Content.java b/platform/platform-api/src/com/intellij/ui/content/Content.java index d3dfcf3d307a..fd0e071238a3 100644 --- a/platform/platform-api/src/com/intellij/ui/content/Content.java +++ b/platform/platform-api/src/com/intellij/ui/content/Content.java @@ -1,17 +1,5 @@ /* - * 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. + * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.intellij.ui.content; @@ -132,4 +120,11 @@ public interface Content extends UserDataHolder, ComponentContainer { */ void setExecutionId(long executionId); long getExecutionId(); + + default void setHelpId(@NonNls String helpId) {} + + @Nullable + default String getHelpId() { + return null; + } } diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java index 035812e17f0b..5a6dddccfa22 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java @@ -1,17 +1,5 @@ /* - * Copyright 2000-2014 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. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.intellij.ui.content.impl; @@ -66,6 +54,7 @@ public class ContentImpl extends UserDataHolderBase implements Content { private String mySeparator; private Icon myPopupIcon; private long myExecutionId; + private String myHelpId; public ContentImpl(JComponent component, String displayName, boolean isPinnable) { myComponent = component; @@ -381,4 +370,15 @@ public class ContentImpl extends UserDataHolderBase implements Content { public long getExecutionId() { return myExecutionId; } + + @Override + public void setHelpId(String helpId) { + myHelpId = helpId; + } + + @Nullable + @Override + public String getHelpId() { + return myHelpId; + } }