From 3a915e21c6097e00afa768ce29f3db22839472e7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 22 Nov 2011 11:09:53 +0100 Subject: [PATCH] @Nullable --- .../intellij/psi/impl/java/stubs/PsiMethodStub.java | 11 ++++++----- .../psi/impl/java/stubs/impl/PsiMethodStubImpl.java | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java index 67ae992346a4..1e1099e31e5f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -14,22 +14,23 @@ * limitations under the License. */ -/* - * @author max - */ package com.intellij.psi.impl.java.stubs; import com.intellij.psi.PsiMethod; import com.intellij.psi.impl.cache.TypeInfo; import com.intellij.psi.stubs.NamedStub; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +/** + * @author max + */ public interface PsiMethodStub extends NamedStub { boolean isConstructor(); boolean isVarArgs(); boolean isAnnotationMethod(); - String getDefaultValueText(); + @Nullable String getDefaultValueText(); @NotNull TypeInfo getReturnTypeText(boolean doResolve); boolean isDeprecated(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java index 35dd68955db4..81420296c9dd 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -174,8 +174,9 @@ public class PsiMethodStubImpl extends StubBase implements PsiMethodS builder.append(getName()).append(":").append(TypeInfo.createTypeText(getReturnTypeText(false))); - if (getDefaultValueText() != null) { - builder.append(" default=").append(getDefaultValueText()); + final String defaultValue = getDefaultValueText(); + if (defaultValue != null) { + builder.append(" default=").append(defaultValue); } builder.append("]");