diff options
Diffstat (limited to 'java/openapi')
3 files changed, 38 insertions, 3 deletions
diff --git a/java/openapi/src/com/intellij/lang/refactoring/JavaNamesValidator.java b/java/openapi/src/com/intellij/lang/refactoring/JavaNamesValidator.java index f00fe56a0289..0d7dc480bb9e 100644 --- a/java/openapi/src/com/intellij/lang/refactoring/JavaNamesValidator.java +++ b/java/openapi/src/com/intellij/lang/refactoring/JavaNamesValidator.java @@ -17,6 +17,7 @@ package com.intellij.lang.refactoring; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiNameHelper; import org.jetbrains.annotations.NotNull; /** @@ -25,11 +26,11 @@ import org.jetbrains.annotations.NotNull; public class JavaNamesValidator implements NamesValidator { @Override public boolean isKeyword(@NotNull String name, Project project) { - return JavaPsiFacade.getInstance(project).getNameHelper().isKeyword(name); + return PsiNameHelper.getInstance(project).isKeyword(name); } @Override public boolean isIdentifier(@NotNull String name, Project project) { - return JavaPsiFacade.getInstance(project).getNameHelper().isIdentifier(name); + return PsiNameHelper.getInstance(project).isIdentifier(name); } } diff --git a/java/openapi/src/com/intellij/openapi/roots/NativeLibraryOrderRootType.java b/java/openapi/src/com/intellij/openapi/roots/NativeLibraryOrderRootType.java new file mode 100644 index 000000000000..58dbf0441ab3 --- /dev/null +++ b/java/openapi/src/com/intellij/openapi/roots/NativeLibraryOrderRootType.java @@ -0,0 +1,34 @@ +/* + * 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. + */ +package com.intellij.openapi.roots; + +/** + * @author nik + */ +public class NativeLibraryOrderRootType extends PersistentOrderRootType { + public static OrderRootType getInstance() { + return getOrderRootType(NativeLibraryOrderRootType.class); + } + + public NativeLibraryOrderRootType() { + super("NATIVE", null, null, null); + } + + @Override + public boolean skipWriteIfEmpty() { + return true; + } +} diff --git a/java/openapi/src/com/intellij/util/xml/converters/AbstractMemberResolveConverter.java b/java/openapi/src/com/intellij/util/xml/converters/AbstractMemberResolveConverter.java index 230fa140d0a3..80852bacf0aa 100644 --- a/java/openapi/src/com/intellij/util/xml/converters/AbstractMemberResolveConverter.java +++ b/java/openapi/src/com/intellij/util/xml/converters/AbstractMemberResolveConverter.java @@ -119,7 +119,7 @@ public abstract class AbstractMemberResolveConverter extends ResolvingConverter< public LocalQuickFix[] getQuickFixes(final ConvertContext context) { final String targetName = ((GenericValue)context.getInvocationElement()).getStringValue(); - if (!JavaPsiFacade.getInstance(context.getProject()).getNameHelper().isIdentifier(targetName)) return super.getQuickFixes(context); + if (!PsiNameHelper.getInstance(context.getProject()).isIdentifier(targetName)) return super.getQuickFixes(context); final PsiClass targetClass = getTargetClass(context); if (targetClass == null) return super.getQuickFixes(context); final PropertyMemberType memberType = getMemberTypes(context)[0]; |