diff --git a/platform/lang-api/src/com/intellij/ide/IconProvider.java b/platform/core-api/src/com/intellij/ide/IconProvider.java similarity index 97% rename from platform/lang-api/src/com/intellij/ide/IconProvider.java rename to platform/core-api/src/com/intellij/ide/IconProvider.java index c02f9dbbabf7..63783898a763 100644 --- a/platform/lang-api/src/com/intellij/ide/IconProvider.java +++ b/platform/core-api/src/com/intellij/ide/IconProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 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. diff --git a/platform/lang-api/src/com/intellij/ide/util/PsiNavigationSupport.java b/platform/core-api/src/com/intellij/ide/util/PsiNavigationSupport.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/PsiNavigationSupport.java rename to platform/core-api/src/com/intellij/ide/util/PsiNavigationSupport.java diff --git a/platform/lang-api/src/com/intellij/lang/ITokenTypeRemapper.java b/platform/core-api/src/com/intellij/lang/ITokenTypeRemapper.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/ITokenTypeRemapper.java rename to platform/core-api/src/com/intellij/lang/ITokenTypeRemapper.java diff --git a/platform/lang-api/src/com/intellij/lang/LanguageParserDefinitions.java b/platform/core-api/src/com/intellij/lang/LanguageParserDefinitions.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/LanguageParserDefinitions.java rename to platform/core-api/src/com/intellij/lang/LanguageParserDefinitions.java diff --git a/platform/lang-api/src/com/intellij/lang/LighterASTNode.java b/platform/core-api/src/com/intellij/lang/LighterASTNode.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/LighterASTNode.java rename to platform/core-api/src/com/intellij/lang/LighterASTNode.java diff --git a/platform/lang-api/src/com/intellij/lang/LighterASTTokenNode.java b/platform/core-api/src/com/intellij/lang/LighterASTTokenNode.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/LighterASTTokenNode.java rename to platform/core-api/src/com/intellij/lang/LighterASTTokenNode.java diff --git a/platform/lang-api/src/com/intellij/lang/LighterLazyParseableNode.java b/platform/core-api/src/com/intellij/lang/LighterLazyParseableNode.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/LighterLazyParseableNode.java rename to platform/core-api/src/com/intellij/lang/LighterLazyParseableNode.java diff --git a/platform/lang-api/src/com/intellij/lang/ParserDefinition.java b/platform/core-api/src/com/intellij/lang/ParserDefinition.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/ParserDefinition.java rename to platform/core-api/src/com/intellij/lang/ParserDefinition.java diff --git a/platform/lang-api/src/com/intellij/lang/PsiBuilder.java b/platform/core-api/src/com/intellij/lang/PsiBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/PsiBuilder.java rename to platform/core-api/src/com/intellij/lang/PsiBuilder.java diff --git a/platform/lang-api/src/com/intellij/lang/PsiBuilderFactory.java b/platform/core-api/src/com/intellij/lang/PsiBuilderFactory.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/PsiBuilderFactory.java rename to platform/core-api/src/com/intellij/lang/PsiBuilderFactory.java diff --git a/platform/lang-api/src/com/intellij/lang/PsiParser.java b/platform/core-api/src/com/intellij/lang/PsiParser.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/PsiParser.java rename to platform/core-api/src/com/intellij/lang/PsiParser.java diff --git a/platform/lang-api/src/com/intellij/lang/TokenSeparatorGenerator.java b/platform/core-api/src/com/intellij/lang/TokenSeparatorGenerator.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/TokenSeparatorGenerator.java rename to platform/core-api/src/com/intellij/lang/TokenSeparatorGenerator.java diff --git a/platform/lang-api/src/com/intellij/lang/WhitespaceSkippedCallback.java b/platform/core-api/src/com/intellij/lang/WhitespaceSkippedCallback.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/WhitespaceSkippedCallback.java rename to platform/core-api/src/com/intellij/lang/WhitespaceSkippedCallback.java diff --git a/platform/lang-api/src/com/intellij/lang/WhitespacesAndCommentsBinder.java b/platform/core-api/src/com/intellij/lang/WhitespacesAndCommentsBinder.java similarity index 100% rename from platform/lang-api/src/com/intellij/lang/WhitespacesAndCommentsBinder.java rename to platform/core-api/src/com/intellij/lang/WhitespacesAndCommentsBinder.java diff --git a/platform/lang-api/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java b/platform/core-api/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java rename to platform/core-api/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java diff --git a/platform/lang-api/src/com/intellij/pom/PomManager.java b/platform/core-api/src/com/intellij/pom/PomManager.java similarity index 95% rename from platform/lang-api/src/com/intellij/pom/PomManager.java rename to platform/core-api/src/com/intellij/pom/PomManager.java index 35d71b1ed667..29c2e2abc072 100644 --- a/platform/lang-api/src/com/intellij/pom/PomManager.java +++ b/platform/core-api/src/com/intellij/pom/PomManager.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. diff --git a/platform/lang-api/src/com/intellij/pom/PomModel.java b/platform/core-api/src/com/intellij/pom/PomModel.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/PomModel.java rename to platform/core-api/src/com/intellij/pom/PomModel.java diff --git a/platform/lang-api/src/com/intellij/pom/PomModelAspect.java b/platform/core-api/src/com/intellij/pom/PomModelAspect.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/PomModelAspect.java rename to platform/core-api/src/com/intellij/pom/PomModelAspect.java diff --git a/platform/lang-api/src/com/intellij/pom/PomTransaction.java b/platform/core-api/src/com/intellij/pom/PomTransaction.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/PomTransaction.java rename to platform/core-api/src/com/intellij/pom/PomTransaction.java diff --git a/platform/lang-api/src/com/intellij/pom/event/PomChangeSet.java b/platform/core-api/src/com/intellij/pom/event/PomChangeSet.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/event/PomChangeSet.java rename to platform/core-api/src/com/intellij/pom/event/PomChangeSet.java diff --git a/platform/lang-api/src/com/intellij/pom/event/PomModelEvent.java b/platform/core-api/src/com/intellij/pom/event/PomModelEvent.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/event/PomModelEvent.java rename to platform/core-api/src/com/intellij/pom/event/PomModelEvent.java diff --git a/platform/lang-api/src/com/intellij/pom/event/PomModelListener.java b/platform/core-api/src/com/intellij/pom/event/PomModelListener.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/event/PomModelListener.java rename to platform/core-api/src/com/intellij/pom/event/PomModelListener.java diff --git a/platform/lang-api/src/com/intellij/pom/impl/PomTransactionBase.java b/platform/core-api/src/com/intellij/pom/impl/PomTransactionBase.java similarity index 100% rename from platform/lang-api/src/com/intellij/pom/impl/PomTransactionBase.java rename to platform/core-api/src/com/intellij/pom/impl/PomTransactionBase.java diff --git a/platform/lang-api/src/com/intellij/psi/FileTypeFileViewProviders.java b/platform/core-api/src/com/intellij/psi/FileTypeFileViewProviders.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/FileTypeFileViewProviders.java rename to platform/core-api/src/com/intellij/psi/FileTypeFileViewProviders.java diff --git a/platform/lang-api/src/com/intellij/psi/FileViewProviderFactory.java b/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/FileViewProviderFactory.java rename to platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java diff --git a/platform/lang-api/src/com/intellij/psi/LanguageFileViewProviders.java b/platform/core-api/src/com/intellij/psi/LanguageFileViewProviders.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/LanguageFileViewProviders.java rename to platform/core-api/src/com/intellij/psi/LanguageFileViewProviders.java diff --git a/platform/lang-api/src/com/intellij/psi/MultiRangeReference.java b/platform/core-api/src/com/intellij/psi/MultiRangeReference.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/MultiRangeReference.java rename to platform/core-api/src/com/intellij/psi/MultiRangeReference.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiCodeFragment.java b/platform/core-api/src/com/intellij/psi/PsiCodeFragment.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiCodeFragment.java rename to platform/core-api/src/com/intellij/psi/PsiCodeFragment.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiDirectoryContainer.java b/platform/core-api/src/com/intellij/psi/PsiDirectoryContainer.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiDirectoryContainer.java rename to platform/core-api/src/com/intellij/psi/PsiDirectoryContainer.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiDocumentManager.java b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiDocumentManager.java rename to platform/core-api/src/com/intellij/psi/PsiDocumentManager.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiElementResolveResult.java b/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiElementResolveResult.java rename to platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiFileFactory.java b/platform/core-api/src/com/intellij/psi/PsiFileFactory.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiFileFactory.java rename to platform/core-api/src/com/intellij/psi/PsiFileFactory.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReference.java b/platform/core-api/src/com/intellij/psi/PsiPolyVariantReference.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiPolyVariantReference.java rename to platform/core-api/src/com/intellij/psi/PsiPolyVariantReference.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceProvider.java b/platform/core-api/src/com/intellij/psi/PsiReferenceProvider.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiReferenceProvider.java rename to platform/core-api/src/com/intellij/psi/PsiReferenceProvider.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceRegistrar.java b/platform/core-api/src/com/intellij/psi/PsiReferenceRegistrar.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiReferenceRegistrar.java rename to platform/core-api/src/com/intellij/psi/PsiReferenceRegistrar.java diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceService.java b/platform/core-api/src/com/intellij/psi/PsiReferenceService.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/PsiReferenceService.java rename to platform/core-api/src/com/intellij/psi/PsiReferenceService.java diff --git a/platform/lang-api/src/com/intellij/psi/ReferenceRange.java b/platform/core-api/src/com/intellij/psi/ReferenceRange.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/ReferenceRange.java rename to platform/core-api/src/com/intellij/psi/ReferenceRange.java diff --git a/platform/lang-api/src/com/intellij/psi/ResolveResult.java b/platform/core-api/src/com/intellij/psi/ResolveResult.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/ResolveResult.java rename to platform/core-api/src/com/intellij/psi/ResolveResult.java diff --git a/platform/lang-api/src/com/intellij/psi/SmartPointerManager.java b/platform/core-api/src/com/intellij/psi/SmartPointerManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/SmartPointerManager.java rename to platform/core-api/src/com/intellij/psi/SmartPointerManager.java diff --git a/platform/lang-api/src/com/intellij/psi/SmartPsiElementPointer.java b/platform/core-api/src/com/intellij/psi/SmartPsiElementPointer.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/SmartPsiElementPointer.java rename to platform/core-api/src/com/intellij/psi/SmartPsiElementPointer.java diff --git a/platform/lang-api/src/com/intellij/psi/SmartPsiFileRange.java b/platform/core-api/src/com/intellij/psi/SmartPsiFileRange.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/SmartPsiFileRange.java rename to platform/core-api/src/com/intellij/psi/SmartPsiFileRange.java diff --git a/platform/lang-api/src/com/intellij/psi/StubBuilder.java b/platform/core-api/src/com/intellij/psi/StubBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/StubBuilder.java rename to platform/core-api/src/com/intellij/psi/StubBuilder.java diff --git a/platform/lang-api/src/com/intellij/psi/TokenType.java b/platform/core-api/src/com/intellij/psi/TokenType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/TokenType.java rename to platform/core-api/src/com/intellij/psi/TokenType.java diff --git a/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java b/platform/core-api/src/com/intellij/psi/impl/ElementBase.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/impl/ElementBase.java rename to platform/core-api/src/com/intellij/psi/impl/ElementBase.java diff --git a/platform/lang-api/src/com/intellij/psi/stubs/DefaultStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/DefaultStubBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/stubs/DefaultStubBuilder.java rename to platform/core-api/src/com/intellij/psi/stubs/DefaultStubBuilder.java diff --git a/platform/lang-api/src/com/intellij/psi/stubs/PsiFileStub.java b/platform/core-api/src/com/intellij/psi/stubs/PsiFileStub.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/stubs/PsiFileStub.java rename to platform/core-api/src/com/intellij/psi/stubs/PsiFileStub.java diff --git a/platform/lang-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java b/platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java rename to platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java diff --git a/platform/lang-api/src/com/intellij/psi/stubs/SerializationManager.java b/platform/core-api/src/com/intellij/psi/stubs/SerializationManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/stubs/SerializationManager.java rename to platform/core-api/src/com/intellij/psi/stubs/SerializationManager.java diff --git a/platform/lang-api/src/com/intellij/psi/templateLanguages/ITemplateDataElementType.java b/platform/core-api/src/com/intellij/psi/templateLanguages/ITemplateDataElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/templateLanguages/ITemplateDataElementType.java rename to platform/core-api/src/com/intellij/psi/templateLanguages/ITemplateDataElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/CustomParsingType.java b/platform/core-api/src/com/intellij/psi/tree/CustomParsingType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/CustomParsingType.java rename to platform/core-api/src/com/intellij/psi/tree/CustomParsingType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/ICompositeElementType.java b/platform/core-api/src/com/intellij/psi/tree/ICompositeElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/ICompositeElementType.java rename to platform/core-api/src/com/intellij/psi/tree/ICompositeElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/IFileElementType.java b/platform/core-api/src/com/intellij/psi/tree/IFileElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/IFileElementType.java rename to platform/core-api/src/com/intellij/psi/tree/IFileElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/ILazyParseableElementType.java b/platform/core-api/src/com/intellij/psi/tree/ILazyParseableElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/ILazyParseableElementType.java rename to platform/core-api/src/com/intellij/psi/tree/ILazyParseableElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/ILeafElementType.java b/platform/core-api/src/com/intellij/psi/tree/ILeafElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/ILeafElementType.java rename to platform/core-api/src/com/intellij/psi/tree/ILeafElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/ILightLazyParseableElementType.java b/platform/core-api/src/com/intellij/psi/tree/ILightLazyParseableElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/ILightLazyParseableElementType.java rename to platform/core-api/src/com/intellij/psi/tree/ILightLazyParseableElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/IReparseableElementType.java b/platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/IReparseableElementType.java rename to platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/IStrongWhitespaceHolderElementType.java b/platform/core-api/src/com/intellij/psi/tree/IStrongWhitespaceHolderElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/IStrongWhitespaceHolderElementType.java rename to platform/core-api/src/com/intellij/psi/tree/IStrongWhitespaceHolderElementType.java diff --git a/platform/lang-api/src/com/intellij/psi/tree/IStubFileElementType.java b/platform/core-api/src/com/intellij/psi/tree/IStubFileElementType.java similarity index 100% rename from platform/lang-api/src/com/intellij/psi/tree/IStubFileElementType.java rename to platform/core-api/src/com/intellij/psi/tree/IStubFileElementType.java diff --git a/platform/lang-api/src/com/intellij/util/PsiIconUtil.java b/platform/core-api/src/com/intellij/util/PsiIconUtil.java similarity index 93% rename from platform/lang-api/src/com/intellij/util/PsiIconUtil.java rename to platform/core-api/src/com/intellij/util/PsiIconUtil.java index 874a1fdeffce..2661844281cd 100644 --- a/platform/lang-api/src/com/intellij/util/PsiIconUtil.java +++ b/platform/core-api/src/com/intellij/util/PsiIconUtil.java @@ -22,10 +22,7 @@ package com.intellij.util; import com.intellij.ide.IconProvider; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.DumbService; -import com.intellij.openapi.project.DumbAware; import com.intellij.psi.PsiElement; -import com.intellij.ui.DeferredIcon; -import com.intellij.ui.IconDeferrer; import org.jetbrains.annotations.Nullable; import javax.swing.*;