From 93fa2b442d4edc54be35b0f8c064d7e07a1d65ba Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Tue, 5 Dec 2017 16:02:47 +0300 Subject: [PATCH] isObsolete is now default --- .../actions/JavaReferringObjectsValue.java | 19 +------------------ .../debugger/ui/impl/watch/DebuggerTree.java | 19 +------------------ .../testSrc/TestCompositeNode.java | 19 +------------------ .../intellij/xdebugger/XDebuggerTestUtil.java | 19 +------------------ .../intellij/xdebugger/XTestContainer.java | 18 +----------------- .../intellij/xdebugger/XTestValueNode.java | 8 +++----- 6 files changed, 8 insertions(+), 94 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java index 49391b8a2f45..5e9cb9a22f9d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java @@ -1,17 +1,5 @@ /* - * 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. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.intellij.debugger.actions; @@ -157,11 +145,6 @@ public class JavaReferringObjectsValue extends JavaValue { @Override public void setFullValueEvaluator(@NotNull XFullValueEvaluator fullValueEvaluator) { } - - @Override - public boolean isObsolete() { - return false; - } }, place); } } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java index 8d73e84f7531..74611a824609 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java @@ -1,17 +1,5 @@ /* - * 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. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ /* @@ -619,11 +607,6 @@ public abstract class DebuggerTree extends DebuggerTreeBase implements DataProvi @NotNull SimpleTextAttributes attributes, @Nullable XDebuggerTreeNodeHyperlink link) { } - - @Override - public boolean isObsolete() { - return false; - } } private class BuildStaticNodeCommand extends BuildNodeCommand { diff --git a/platform/script-debugger/debugger-ui/testSrc/TestCompositeNode.java b/platform/script-debugger/debugger-ui/testSrc/TestCompositeNode.java index 1695a6949fa2..7886a05a685f 100644 --- a/platform/script-debugger/debugger-ui/testSrc/TestCompositeNode.java +++ b/platform/script-debugger/debugger-ui/testSrc/TestCompositeNode.java @@ -1,17 +1,5 @@ /* - * Copyright 2000-2016 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 org.jetbrains.debugger; @@ -91,11 +79,6 @@ public class TestCompositeNode implements XCompositeNode { public void setMessage(@NotNull String message, @Nullable Icon icon, @NotNull SimpleTextAttributes attributes, @Nullable XDebuggerTreeNodeHyperlink link) { } - @Override - public boolean isObsolete() { - return false; - } - @NotNull public Promise getResult() { return result; diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java index cb52fc98d72c..560285018f6a 100644 --- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java +++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java @@ -1,17 +1,5 @@ /* - * 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. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.intellij.xdebugger; @@ -354,11 +342,6 @@ public class XDebuggerTestUtil { public void errorOccurred(@NotNull String errorMessage) { result.set(errorMessage); } - - @Override - public boolean isObsolete() { - return false; - } }); assertEquals(value, result.get(TIMEOUT_MS, TimeUnit.MILLISECONDS)); diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestContainer.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestContainer.java index 784b2a2be4dd..57ac8996651c 100644 --- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestContainer.java +++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestContainer.java @@ -1,17 +1,5 @@ /* - * Copyright 2000-2016 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.xdebugger; @@ -52,10 +40,6 @@ public class XTestContainer { myFinished.release(); } - public boolean isObsolete() { - return false; - } - public Pair, String> waitFor(long timeoutMs) { if (!XDebuggerTestUtil.waitFor(myFinished, timeoutMs)) { throw new AssertionError("Waiting timed out"); diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestValueNode.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestValueNode.java index ced45522ba6c..32c78f2533c9 100644 --- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestValueNode.java +++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestValueNode.java @@ -1,3 +1,6 @@ +/* + * 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.xdebugger; import com.intellij.xdebugger.frame.XFullValueEvaluator; @@ -38,11 +41,6 @@ public class XTestValueNode extends XValueNodePresentationConfigurator.Configura myFullValueEvaluator = fullValueEvaluator; } - @Override - public boolean isObsolete() { - return false; - } - public void waitFor(long timeoutInMillis) { if (!XDebuggerTestUtil.waitFor(myFinished, timeoutInMillis)) { throw new AssertionError("Waiting timed out");