From 3c13a85882dafc4a79869f0e9b990078995f5f48 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Sun, 11 Oct 2009 21:31:18 +0400 Subject: [PATCH] update copyright --- .../util/xml/DomDocumentationProvider.java | 15 +++ .../src/com/intellij/util/xml/DomFileIndex.java | 15 ++- .../util/xml/DomNameSuggestionProvider.java | 15 +++ .../intellij/util/xml/DomUsageTypeProvider.java | 14 ++- .../util/xml/ElementPresentationManagerImpl.java | 14 ++- .../src/com/intellij/util/xml/InvocationStack.java | 14 ++- .../DomCollectionProblemDescriptorImpl.java | 14 ++- .../DomElementAnnotationHolderImpl.java | 14 ++- .../DomElementAnnotationsManagerImpl.java | 14 ++- .../DomElementProblemDescriptorImpl.java | 14 ++- .../DomElementResolveProblemDescriptorImpl.java | 15 ++- .../xml/highlighting/DomElementsErrorPanel.java | 14 ++- .../highlighting/DomElementsHighlightingUtil.java | 14 ++- .../DomElementsProblemsHolderImpl.java | 14 ++- .../util/xml/highlighting/DomHighlightStatus.java} | 10 +- .../highlighting/DomHighlightingHelperImpl.java | 15 ++- .../highlighting/MockAnnotatingDomInspection.java | 15 ++- .../util/xml/highlighting/MockDomInspection.java | 15 ++- .../impl/AbstractCollectionChildDescription.java} | 23 ++-- .../xml/impl/AbstractDomChildDescriptionImpl.java | 14 ++- .../impl/AddToCompositeCollectionInvocation.java | 15 ++- .../util/xml/impl/BasicDomElementPresentation.java | 15 +++ .../util/xml/impl/ChildrenDescriptionsHolder.java | 14 ++- .../util/xml/impl/ConvertAnnotationImpl.java | 14 ++- .../xml/impl/CustomDomChildrenDescriptionImpl.java | 14 ++- .../util/xml/impl/DefaultDomAnnotator.java | 14 ++- .../impl/DefaultDomTargetDescriptionProvider.java | 15 ++- .../xml/impl/DefaultDomTargetIconProvider.java} | 29 ++--- .../com/intellij/util/xml/impl/DomAnchorImpl.java | 15 ++- .../util/xml/impl/DomApplicationComponent.java | 14 ++- .../util/xml/impl/DomCompletionContributor.java | 15 ++- .../util/xml/impl/DomDeclarationSearcher.java | 15 ++- .../util/xml/impl/DomDescriptorProvider.java | 15 +++ .../xml/impl/DomElementsNavigationManagerImpl.java | 14 ++- .../intellij/util/xml/impl/DomGenericInfoEx.java | 14 ++- .../com/intellij/util/xml/impl/DomImplUtil.java | 14 ++- .../intellij/util/xml/impl/DomParentStrategy.java} | 26 +++-- .../util/xml/impl/DomReferenceContributor.java} | 26 ++--- .../intellij/util/xml/impl/DomSemContributor.java | 15 ++- .../com/intellij/util/xml/impl/DomServiceImpl.java | 14 ++- .../util/xml/impl/DomTemplateRunnerImpl.java | 15 +++ .../util/xml/impl/DummyEvaluatedXmlName.java | 14 ++- .../intellij/util/xml/impl/DynamicGenericInfo.java | 14 ++- .../util/xml/impl/EvaluatedXmlNameImpl.java | 15 ++- .../impl/FileDescriptionCachedValueProvider.java | 14 ++- .../util/xml/impl/GenericDomValueReference.java | 14 ++- .../xml/impl/GenericValueReferenceProvider.java | 14 ++- .../xml/impl/GetCompositeCollectionInvocation.java | 15 ++- .../util/xml/impl/ImplementationClassCache.java | 14 ++- .../util/xml/impl/MockDomFileDescription.java | 14 ++- .../util/xml/impl/PhysicalDomParentStrategy.java | 15 ++- .../util/xml/impl/PropertyAccessorInvocation.java | 15 ++- .../util/xml/impl/RootDomParentStrategy.java | 15 ++- .../util/xml/impl/StableInvocationHandler.java | 14 ++- .../util/xml/impl/StaticGenericInfoBuilder.java | 14 ++- .../util/xml/impl/VirtualDomParentStrategy.java | 15 ++- .../intellij/util/xml/impl/VisitorDescription.java | 14 ++- .../intellij/util/xml/reflect/DomExtenderEP.java | 14 ++- .../util/xml/reflect/DomExtensionImpl.java | 14 ++- .../xml/reflect/DomExtensionsRegistrarImpl.java | 14 ++- .../xml/structure/DomStructureTreeElement.java | 14 ++- .../xml/structure/DomStructureViewBuilder.java | 14 ++- .../xml/structure/DomStructureViewTreeModel.java | 14 ++- .../xml/tree/actions/AddDomElementActionGroup.java | 14 ++- .../tree/actions/AddElementInCollectionAction.java | 14 ++- .../util/xml/tree/actions/BaseDomTreeAction.java | 14 ++- .../util/xml/tree/actions/DeleteDomElement.java | 14 ++- .../xml/tree/actions/DomElementsToggleAction.java | 14 ++- .../actions/GotoDomElementDeclarationAction.java | 14 ++- .../com/intellij/util/xml/ui/DomUIFactoryImpl.java | 14 ++- .../util/xml/ui/EditorTextFieldControl.java | 14 ++- .../src/com/intellij/util/xml/ui/TextControl.java | 14 ++- .../xml/impl/dom/DomAttributeXmlDescriptor.java | 15 +++ .../xml/impl/dom/DomElementXmlDescriptor.java | 15 +++ .../intellij/javaee/web/PsiReferenceConverter.java | 2 +- .../com/intellij/patterns/DomElementPattern.java | 14 ++- .../src/com/intellij/patterns/DomPatterns.java | 14 ++- .../intellij/patterns/GenericDomValuePattern.java | 14 ++- .../intellij/util/xml/AbstractConvertContext.java | 2 +- .../com/intellij/util/xml/AnnotatedElement.java | 2 +- .../src/com/intellij/util/xml/Attribute.java | 2 +- .../src/com/intellij/util/xml/Convert.java | 2 +- .../src/com/intellij/util/xml/ConvertContext.java | 2 +- .../src/com/intellij/util/xml/Converter.java | 2 +- .../com/intellij/util/xml/ConverterManager.java | 2 +- .../src/com/intellij/util/xml/CustomChildren.java | 2 +- .../util/xml/CustomReferenceConverter.java | 2 +- .../{MutableGenericValue.java => DefinesXml.java} | 16 ++- .../src/com/intellij/util/xml/DomBundle.java | 2 +- .../com/intellij/util/xml/DomChangeAdapter.java | 2 +- .../src/com/intellij/util/xml/DomElement.java | 2 +- .../util/xml/DomElementNavigationProvider.java | 2 +- .../intellij/util/xml/DomElementPresentation.java | 2 +- .../com/intellij/util/xml/DomElementVisitor.java | 2 +- .../util/xml/DomElementsNavigationManager.java | 2 +- .../src/com/intellij/util/xml/DomEventAdapter.java | 2 +- .../com/intellij/util/xml/DomEventListener.java | 2 +- .../src/com/intellij/util/xml/DomEventVisitor.java | 2 +- .../com/intellij/util/xml/DomFileDescription.java | 2 +- .../src/com/intellij/util/xml/DomFileElement.java | 2 +- .../{ScopeProvider.java => DomIconProvider.java} | 28 ++--- .../src/com/intellij/util/xml/DomManager.java | 2 +- .../src/com/intellij/util/xml/DomMetaData.java | 2 +- .../src/com/intellij/util/xml/DomNameStrategy.java | 2 +- .../intellij/util/xml/DomReferenceInjector.java} | 17 ++- .../com/intellij/util/xml/DomReflectionUtil.java | 2 +- .../com/intellij/util/xml/DomResolveConverter.java | 2 +- .../src/com/intellij/util/xml/DomService.java | 2 +- .../src/com/intellij/util/xml/DomTarget.java | 18 ++-- .../com/intellij/util/xml/ElementPresentation.java | 2 +- .../util/xml/ElementPresentationManager.java | 2 +- ...{GenericDomValue.java => EvaluatedXmlName.java} | 17 +-- .../intellij/util/xml/GenericAttributeValue.java | 2 +- .../src/com/intellij/util/xml/GenericDomValue.java | 2 +- .../src/com/intellij/util/xml/GenericValue.java | 2 +- .../com/intellij/util/xml/GenericValueUtil.java | 2 +- .../com/intellij/util/xml/HyphenNameStrategy.java | 2 +- .../src/com/intellij/util/xml/Implementation.java | 2 +- .../src/com/intellij/util/xml/Intersect.java | 2 +- .../src/com/intellij/util/xml/JavaMethod.java | 2 +- .../com/intellij/util/xml/JavaMethodSignature.java | 2 +- .../com/intellij/util/xml/JavaNameStrategy.java | 2 +- .../src/com/intellij/util/xml/MergedObject.java | 2 +- .../intellij/util/xml/MergingFileDescription.java | 2 +- .../src/com/intellij/util/xml/ModelMerger.java | 2 +- .../src/com/intellij/util/xml/ModelMergerUtil.java | 2 +- .../util/xml/ModuleContentRootSearchScope.java | 15 +++ .../com/intellij/util/xml/MutableGenericValue.java | 2 +- .../src/com/intellij/util/xml/NameStrategy.java | 2 +- .../util/xml/NameStrategyForAttributes.java | 2 +- .../src/com/intellij/util/xml/NameValue.java | 2 +- .../src/com/intellij/util/xml/NamedEnum.java | 2 +- .../src/com/intellij/util/xml/NamedEnumUtil.java | 2 +- .../src/com/intellij/util/xml/Namespace.java | 2 +- .../com/intellij/util/xml/ParentScopeProvider.java | 2 +- .../src/com/intellij/util/xml/PrimaryKey.java | 2 +- .../com/intellij/util/xml/PropertyAccessor.java | 2 +- .../src/com/intellij/util/xml/Referencing.java | 2 +- .../src/com/intellij/util/xml/Required.java | 2 +- .../src/com/intellij/util/xml/Resolve.java | 2 +- .../com/intellij/util/xml/ResolvingConverter.java | 2 +- .../com/intellij/util/xml/RootScopeProvider.java | 2 +- .../src/com/intellij/util/xml/Scope.java | 2 +- .../src/com/intellij/util/xml/ScopeProvider.java | 2 +- .../src/com/intellij/util/xml/StableElement.java | 2 +- .../src/com/intellij/util/xml/SubTag.java | 2 +- .../src/com/intellij/util/xml/SubTagList.java | 2 +- .../src/com/intellij/util/xml/SubTagsList.java | 2 +- .../src/com/intellij/util/xml/TagValue.java | 2 +- .../src/com/intellij/util/xml/TypeChooser.java | 2 +- .../com/intellij/util/xml/TypeChooserManager.java | 2 +- .../com/intellij/util/xml/WrappingConverter.java | 2 +- .../src/com/intellij/util/xml/XmlName.java | 2 +- .../generate/AbstractDomGenerateProvider.java | 15 +++ .../generate/DefaultGenerateElementProvider.java | 2 +- .../generate/DomTemplateRunner.java} | 25 ++--- .../xml/converters/DelimitedListConverter.java | 2 +- .../xml/converters/DelimitedListProcessor.java | 15 +++ .../xml/converters/PathReferenceConverter.java | 2 +- .../util/xml/converters/QuotedValueConverter.java | 2 +- .../converters/values/BooleanValueConverter.java | 14 ++- .../converters/values/CharacterValueConverter.java | 15 +++ .../converters/values/NumberValueConverter.java | 14 ++- .../src/com/intellij/util/xml/events/DomEvent.java | 2 +- .../util/xml/events/ElementChangedEvent.java | 2 +- .../util/xml/events/ElementDefinedEvent.java | 2 +- .../util/xml/events/ElementUndefinedEvent.java | 2 +- .../xml/highlighting/AddDomElementQuickFix.java | 2 +- .../highlighting/BasicDomElementsInspection.java | 2 +- .../DomCollectionProblemDescriptor.java | 2 +- .../highlighting/DomCustomAnnotationChecker.java | 15 ++- .../highlighting/DomElementAnnotationHolder.java | 2 +- .../highlighting/DomElementAnnotationsManager.java | 2 +- .../highlighting/DomElementProblemDescriptor.java | 2 +- .../DomElementResolveProblemDescriptor.java | 2 +- .../xml/highlighting/DomElementsAnnotator.java | 2 +- .../xml/highlighting/DomElementsInspection.java | 2 +- .../highlighting/DomElementsProblemsHolder.java | 2 +- .../xml/highlighting/DomHighlightingHelper.java | 2 +- .../xml/highlighting/RemoveDomElementQuickFix.java | 2 +- .../xml/highlighting/ResolvingElementQuickFix.java | 2 +- .../src/com/intellij/util/xml/model/DomModel.java | 2 +- .../com/intellij/util/xml/model/DomModelCache.java | 2 +- .../util/xml/model/MultipleDomModelFactory.java | 15 +++ .../SimpleModelFactory.java} | 23 ++-- .../xml/model/gotosymbol/GoToSymbolProvider.java | 2 +- .../util/xml/model/impl/BaseDomModelFactory.java | 15 +++ .../impl/CachedDomModelFactory.java} | 30 ++---- .../model/impl/CachedMultipleDomModelFactory.java | 15 +++ .../model/impl/CachedSimpleDomModelFactory.java | 15 +++ .../util/xml/model/impl/DomModelFactory.java | 2 +- .../util/xml/model/impl/DomModelFactoryHelper.java | 15 +++ .../intellij/util/xml/model/impl/DomModelImpl.java | 2 +- .../util/xml/model/impl/SimpleDomModelFactory.java | 2 +- .../reflect/AbstractDomChildrenDescription.java | 2 +- .../xml/reflect/CustomDomChildrenDescription.java | 2 +- .../xml/reflect/DomAttributeChildDescription.java | 2 +- .../util/xml/reflect/DomChildrenDescription.java | 2 +- .../xml/reflect/DomCollectionChildDescription.java | 2 +- .../com/intellij/util/xml/reflect/DomExtender.java | 2 +- .../intellij/util/xml/reflect/DomExtension.java | 2 +- .../util/xml/reflect/DomExtensionsRegistrar.java | 2 +- .../util/xml/reflect/DomFixedChildDescription.java | 2 +- .../intellij/util/xml/reflect/DomGenericInfo.java | 2 +- .../util/xml/tree/AbstractDomElementNode.java | 2 +- .../intellij/util/xml/tree/BaseDomElementNode.java | 2 +- .../util/xml/tree/DomElementsGroupNode.java | 2 +- .../intellij/util/xml/tree/DomFileElementNode.java | 2 +- .../util/xml/tree/DomModelTreeStructure.java | 2 +- .../intellij/util/xml/tree/DomModelTreeView.java | 2 +- .../intellij/util/xml/tree/GenericValueNode.java | 2 +- .../util/xml/ui/AbstractDomElementComponent.java | 2 +- .../intellij/util/xml/ui/AbstractTableView.java | 2 +- .../src/com/intellij/util/xml/ui/BaseControl.java | 2 +- .../util/xml/ui/BaseModifiableControl.java | 2 +- .../util/xml/ui/BasicDomElementComponent.java | 2 +- .../intellij/util/xml/ui/BigStringComponent.java | 2 +- .../src/com/intellij/util/xml/ui/BigTextPanel.java | 2 +- .../intellij/util/xml/ui/BooleanColumnInfo.java | 2 +- .../com/intellij/util/xml/ui/BooleanControl.java | 2 +- .../intellij/util/xml/ui/BooleanEnumControl.java | 2 +- .../com/intellij/util/xml/ui/CaptionComponent.java | 2 +- .../util/xml/ui/ChildGenericValueColumnInfo.java | 2 +- .../src/com/intellij/util/xml/ui/ComboControl.java | 2 +- .../intellij/util/xml/ui/ComboTableCellEditor.java | 2 +- .../com/intellij/util/xml/ui/CommitAdapter.java | 2 +- .../com/intellij/util/xml/ui/CommitListener.java | 2 +- .../ui/CommitablePanelUserActivityListener.java | 2 +- .../src/com/intellij/util/xml/ui/Committable.java | 2 +- .../com/intellij/util/xml/ui/CommittablePanel.java | 2 +- .../com/intellij/util/xml/ui/CommittableUtil.java | 2 +- .../intellij/util/xml/ui/CompositeCommittable.java | 2 +- .../intellij/util/xml/ui/DomCollectionControl.java | 2 +- .../intellij/util/xml/ui/DomCollectionWrapper.java | 2 +- .../com/intellij/util/xml/ui/DomColumnInfo.java | 2 +- .../com/intellij/util/xml/ui/DomEditorManager.java | 2 +- .../com/intellij/util/xml/ui/DomFileEditor.java | 2 +- .../com/intellij/util/xml/ui/DomFixedWrapper.java | 2 +- .../com/intellij/util/xml/ui/DomStringWrapper.java | 2 +- .../src/com/intellij/util/xml/ui/DomTableView.java | 2 +- .../src/com/intellij/util/xml/ui/DomUIControl.java | 2 +- .../src/com/intellij/util/xml/ui/DomUIFactory.java | 2 +- .../util/xml/ui/DomUINavigationProvider.java | 2 +- .../src/com/intellij/util/xml/ui/DomWrapper.java | 2 +- .../util/xml/ui/EditedElementDescription.java | 2 +- .../intellij/util/xml/ui/EditorContainerPanel.java | 2 +- .../src/com/intellij/util/xml/ui/EmptyPane.java | 2 +- .../util/xml/ui/ErrorableTableCellRenderer.java | 2 +- .../util/xml/ui/GenericValueColumnInfo.java | 2 +- .../com/intellij/util/xml/ui/Highlightable.java | 2 +- .../util/xml/ui/MockDomElementsEditor.java | 2 +- .../intellij/util/xml/ui/MultiLineTextPanel.java | 2 +- .../util/xml/ui/PerspectiveFileEditor.java | 2 +- .../util/xml/ui/PerspectiveFileEditorProvider.java | 2 +- .../com/intellij/util/xml/ui/PsiClassPanel.java | 2 +- .../src/com/intellij/util/xml/ui/PsiTypePanel.java | 2 +- .../com/intellij/util/xml/ui/StringColumnInfo.java | 2 +- .../util/xml/ui/StripeTableCellRenderer.java | 2 +- .../src/com/intellij/util/xml/ui/TextPanel.java | 2 +- .../src/com/intellij/util/xml/ui/TooltipUtils.java | 2 +- .../src/com/intellij/util/xml/ui/UndoHelper.java | 2 +- .../src/com/intellij/util/xml/ui/Warning.java | 2 +- .../util/xml/ui/actions/AddDomElementAction.java | 2 +- .../util/xml/ui/actions/DefaultAddAction.java | 2 +- .../actions/generate/GenerateDomElementAction.java | 2 +- .../generate/GenerateDomElementProvider.java | 2 +- .../application/options/CodeStyleHtmlPanel.java | 36 ++----- .../application/options/CodeStyleXmlPanel.java | 36 ++----- .../options/HtmlCodeStyleSettingsProvider.java | 15 +++ .../application/options/TagListDialog.java | 15 +++ .../options/XmlAutoImportOptionsProvider.java | 15 +++ .../options/XmlCodeStyleSettingsProvider.java | 15 +++ .../options/XmlIndentOptionsProvider.java | 15 +++ .../options/XmlOptionsApplicabilityFilter.java} | 12 +-- .../intellij/application/options/XmlSettings.java | 15 +++ .../editor/WebEditorAppearanceConfigurable.java | 15 +++ .../options/editor/WebEditorOptions.java | 15 +++ .../options/editor/WebEditorOptionsProvider.java | 15 +++ .../editor/XmlCodeFoldingOptionsProvider.java} | 31 +++--- .../options/editor/XmlFoldingSettings.java | 2 +- .../codeInsight/actions/GenerateDTDAction.java | 15 +++ .../codeInsight/completion/DtdCompletionData.java | 14 ++- .../completion/ExtendedTagInsertHandler.java | 15 +++ .../codeInsight/completion/HtmlCompletionData.java | 15 +++ .../completion/XHtmlCompletionData.java} | 19 ++-- .../completion/XmlAttributeInsertHandler.java | 15 ++- .../completion/XmlAutoLookupHandler.java | 15 +++ .../codeInsight/completion/XmlCharFilter.java | 16 +++ .../completion/XmlCompletionContributor.java | 15 +++ .../codeInsight/completion/XmlCompletionData.java | 15 +++ .../completion/XmlSmartEnterProcessor.java | 15 +++ .../completion/XmlTagInsertHandler.java | 15 +++ .../codeInsight/daemon/XmlErrorMessages.java | 14 ++- .../analysis/CreateNSDeclarationIntentionFix.java | 15 +++ .../daemon/impl/analysis/ImportNSAction.java | 15 +++ .../impl/analysis/InsertRequiredAttributeFix.java | 2 +- .../impl/analysis/RemoveAttributeIntentionFix.java | 15 +++ .../impl/analysis/XmlErrorQuickFixProvider.java | 15 +++ .../daemon/impl/analysis/XmlHighlightVisitor.java | 15 +++ .../XmlHighlightVisitorBasedInspection.java | 15 +++ .../daemon/impl/analysis/XmlNSRenderer.java | 15 +++ .../analysis/XmlUnboundNsPrefixInspection.java | 15 +++ .../analysis/encoding/XmlEncodingReference.java | 15 +++ .../encoding/XmlEncodingReferenceProvider.java | 15 +++ .../AddXsiSchemaLocationForExtResourceAction.java | 15 +++ .../impl/quickfix/BaseExtResourceAction.java | 15 +++ .../impl/quickfix/FetchExtResourceAction.java | 15 +++ .../impl/quickfix/IgnoreExtResourceAction.java | 15 +++ .../quickfix/ManuallySetupExtResourceAction.java | 15 +++ .../codeInsight/editorActions/DtdSelectioner.java | 15 +++ .../editorActions/EnterBetweenXmlTagsHandler.java | 15 +++ .../editorActions/HtmlQuoteHandler.java | 14 ++- .../codeInsight/editorActions/HtmlSelectioner.java | 16 +++ .../editorActions/XmlAutoPopupHandler.java | 15 +++ .../XmlBasicWordSelectionFilter.java} | 23 ++-- .../editorActions/XmlCDATAContentSelectioner.java | 15 +++ .../editorActions/XmlCopyPastePreProcessor.java | 15 +++ .../editorActions/XmlElementSelectioner.java} | 21 ++-- .../editorActions/XmlGtTypedHandler.java | 15 +++ .../editorActions/XmlLineSelectioner.java | 15 +++ .../codeInsight/editorActions/XmlQuoteHandler.java | 14 ++- .../editorActions/XmlSlashTypedHandler.java | 15 +++ .../editorActions/XmlTagSelectioner.java | 15 +++ .../editorActions/XmlTokenSelectioner.java | 15 +++ .../editorActions/moveUpDown/XmlMover.java | 15 +++ .../folding/impl/XmlElementSignatureProvider.java | 15 +++ .../surroundWith/TemplateSurrounder.java | 15 +++ .../highlighting/HtmlClosingTagErrorFilter.java | 15 +++ .../highlighting/XmlReadWriteAccessDetector.java | 15 +++ .../hint/TagDeclarationRangeHandler.java | 15 +++ .../hint/XmlImplementationTextSelectioner.java | 16 +++ .../hint/api/impls/XmlParameterInfoHandler.java | 15 +++ .../XmlMethodNavigationOffsetProvider.java | 15 +++ .../codeInsight/template/HtmlContextType.java | 15 +++ .../codeInsight/template/XmlContextType.java} | 18 ++-- .../template/XmlDefaultLiveTemplatesProvider.java} | 15 ++- .../AddCustomTagOrAttributeIntentionAction.java | 14 ++- .../AddHtmlTagOrAttributeToCustomsIntention.java | 14 ++- .../HtmlExtraClosingTagInspection.java | 14 ++- .../htmlInspections/HtmlLocalInspectionTool.java | 14 ++- .../HtmlUnknownAttributeInspection.java | 14 ++- .../htmlInspections/HtmlUnknownTagInspection.java | 14 ++- .../RemoveAttributeIntentionAction.java | 14 ++- .../RemoveExtraClosingTagIntentionAction.java | 14 ++- .../RenameTagBeginOrEndIntentionAction.java | 14 ++- .../RequiredAttributesInspection.java | 2 +- .../htmlInspections/XmlInspectionToolProvider.java | 15 +++ .../XmlWrongClosingTagNameInspection.java | 14 ++- .../XmlWrongRootElementInspection.java | 14 ++- .../XmlProductivityFeatureProvider.java | 15 +++ .../com/intellij/html/HtmlLineMarkerProvider.java | 15 +++ .../src/com/intellij/html/HtmlLinkTagIndex.java | 15 +++ .../RelaxedHtmlFromSchemaElementDescriptor.java | 15 +++ .../impl/RelaxedHtmlFromSchemaNSDescriptor.java | 15 +++ .../com/intellij/ide/actions/CreateHtmlAction.java | 14 ++- .../intellij/ide/actions/CreateXhtmlAction.java} | 16 +-- .../ide/browsers/BrowserSettingsProviderImpl.java | 15 +++ .../ide/browsers/BrowserSpecificSettings.java} | 18 ++-- .../ide/browsers/BrowsersConfiguration.java | 15 +++ .../ide/browsers/HtmlWebBrowserUrlProvider.java | 15 +++ .../intellij/ide/browsers/WebBrowserSettings.java | 15 +++ .../intellij/ide/browsers/WebBrowsersPanel.java | 15 +++ .../ide/browsers/firefox/FirefoxProfile.java | 15 +++ .../ide/browsers/firefox/FirefoxSettings.java | 15 +++ .../firefox/FirefoxSettingsConfigurable.java | 15 +++ .../intellij/ide/browsers/firefox/FirefoxUtil.java | 15 +++ .../com/intellij/ide/highlighter/DTDFileType.java | 118 +++++++++------------ .../ide/highlighter/HtmlFileHighlighter.java | 36 ++----- .../com/intellij/ide/highlighter/HtmlFileType.java | 36 ++----- .../ide/highlighter/HtmlHighlighterFactory.java} | 31 +++--- .../intellij/ide/highlighter/XHtmlFileType.java | 118 +++++++++------------ .../ide/highlighter/XmlFileHighlighter.java | 36 ++----- .../com/intellij/ide/highlighter/XmlFileType.java | 36 ++----- .../ide/highlighter/XmlHighlighterFactory.java} | 22 ++-- .../intellij/ide/highlighter/XmlLikeFileType.java | 15 +++ .../impl/xml/AbstractXmlTagTreeElement.java | 15 +++ .../structureView/impl/xml/DtdFileTreeElement.java | 36 ++----- .../structureView/impl/xml/XmlFileTreeElement.java | 36 ++----- .../impl/xml/XmlStructureViewTreeModel.java | 36 ++----- .../structureView/impl/xml/XmlTagTreeElement.java | 36 ++----- .../util/treeView/XmlDoctypeNodeDescriptor.java} | 22 ++-- .../com/intellij/javaee/EditLocationDialog.java | 15 +++ .../javaee/ExternalResourceConfigurable.java | 15 +++ .../intellij/javaee/ExternalResourceListener.java} | 10 +- .../intellij/javaee/ExternalResourceManagerEx.java | 15 +++ .../javaee/ExternalResourceManagerImpl.java | 15 +++ .../ImplicitNamespaceDescriptorProvider.java | 15 +++ .../intellij/javaee/InternalResourceProvider.java | 15 +++ .../src/com/intellij/javaee/ProjectResources.java | 15 +++ .../javaee/PsiExternalResourceNotifier.java | 15 +++ .../com/intellij/javaee/ResourceRegistrarImpl.java | 18 ++-- .../src/com/intellij/lang/dtd/DTDLanguage.java | 15 +++ .../com/intellij/lang/dtd/DTDParserDefinition.java | 15 +++ .../lang/dtd/DtdStructureViewBuilderFactory.java | 16 +++ .../src/com/intellij/lang/html/HTMLLanguage.java | 15 +++ .../src/com/intellij/lang/html/HTMLParser.java | 16 +++ .../intellij/lang/html/HTMLParserDefinition.java | 15 +++ .../lang/html/HtmlFormattingModelBuilder.java | 16 +++ .../src/com/intellij/lang/html/HtmlParsing.java | 16 +++ .../src/com/intellij/lang/xhtml/XHTMLLanguage.java | 15 +++ .../intellij/lang/xhtml/XHTMLParserDefinition.java | 15 +++ .../lang/xhtml/XhtmlFormattingModelBuilder.java | 16 +++ .../intellij/lang/xml/XMLExternalAnnotator.java | 15 +++ .../src/com/intellij/lang/xml/XMLLanguage.java | 15 +++ .../com/intellij/lang/xml/XMLParserDefinition.java | 15 +++ .../src/com/intellij/lang/xml/XmlASTFactory.java | 16 +++ .../src/com/intellij/lang/xml/XmlCommenter.java} | 36 ++++--- .../lang/xml/XmlEnclosingTagUnwrapper.java | 15 +++ .../com/intellij/lang/xml/XmlFileViewProvider.java | 15 +++ .../lang/xml/XmlFileViewProviderFactory.java | 15 +++ .../intellij/lang/xml/XmlFindUsagesProvider.java | 15 +++ .../com/intellij/lang/xml/XmlFoldingBuilder.java | 15 +++ .../com/intellij/lang/xml/XmlFormattingModel.java | 16 +++ .../lang/xml/XmlFormattingModelBuilder.java | 16 +++ .../lang/xml/XmlStructureViewBuilderFactory.java | 16 +++ .../intellij/lang/xml/XmlSurroundDescriptor.java | 15 +++ .../com/intellij/lang/xml/XmlUnwrapDescriptor.java | 15 +++ .../intellij/lang/xml/XmlWordCompletionFilter.java | 16 +++ xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java | 15 +++ .../com/intellij/lexer/DtdHighlightingLexer.java | 15 +++ .../com/intellij/lexer/HtmlHighlightingLexer.java | 15 +++ xml/impl/src/com/intellij/lexer/HtmlLexer.java | 15 +++ xml/impl/src/com/intellij/lexer/OldXmlLexer.java | 15 +++ .../intellij/lexer/XHtmlHighlightingLexer.java} | 23 ++-- .../src/com/intellij/lexer/XHtmlLexer.java} | 29 ++--- .../com/intellij/lexer/XmlHighlightingLexer.java | 15 +++ xml/impl/src/com/intellij/lexer/XmlLexer.java | 15 +++ xml/impl/src/com/intellij/lexer/_HtmlLexer.java | 16 +++ xml/impl/src/com/intellij/lexer/_OldXmlLexer.java | 16 +++ xml/impl/src/com/intellij/lexer/_XmlLexer.java | 16 +++ xml/impl/src/com/intellij/lexer/__XmlLexer.java | 16 +++ .../options/colors/pages/HTMLColorsPage.java | 36 ++----- .../options/colors/pages/XMLColorsPage.java | 36 ++----- .../pom/xml/impl/XmlAspectChangeSetImpl.java | 15 +++ .../com/intellij/pom/xml/impl/XmlAspectImpl.java | 15 +++ .../pom/xml/impl/events/XmlAttributeSetImpl.java | 15 +++ .../xml/impl/events/XmlDocumentChangedImpl.java | 15 +++ .../pom/xml/impl/events/XmlElementChangedImpl.java | 15 +++ .../pom/xml/impl/events/XmlTagChildAddImpl.java | 15 +++ .../xml/impl/events/XmlTagChildChangedImpl.java | 15 +++ .../xml/impl/events/XmlTagChildRemovedImpl.java | 15 +++ .../pom/xml/impl/events/XmlTagNameChangedImpl.java | 15 +++ .../pom/xml/impl/events/XmlTextChangedImpl.java | 15 +++ .../psi/CompositeLanguageFileViewProvider.java | 15 +++ .../com/intellij/psi/XmlElementFactoryImpl.java | 15 +++ .../com/intellij/psi/filters/TagNameFilter.java | 15 +++ .../intellij/psi/filters/TextContainFilter.java | 15 +++ .../com/intellij/psi/filters/TextStartFilter.java | 15 +++ .../com/intellij/psi/filters/XmlTagFilter.java} | 31 +++--- .../com/intellij/psi/filters/XmlTextFilter.java | 15 +++ .../filters/getters/HtmlAttributeValueGetter.java | 15 +++ .../filters/getters/XmlAttributeValueGetter.java | 15 +++ .../psi/filters/position/RootTagFilter.java | 15 +++ .../filters/position/TargetNamespaceFilter.java | 15 +++ .../psi/filters/position/XmlTokenTypeFilter.java | 15 +++ .../psi/formatter/XmlFormatterUtilHelper.java | 16 +++ .../psi/formatter/xml/AbstractSyntheticBlock.java | 15 +++ .../psi/formatter/xml/AbstractXmlBlock.java | 15 +++ .../formatter/xml/AnotherLanguageBlockWrapper.java | 15 +++ .../com/intellij/psi/formatter/xml/HtmlPolicy.java | 15 +++ .../xml/InjectedLanguageBlockWrapper.java | 15 +++ .../intellij/psi/formatter/xml/ReadOnlyBlock.java | 15 +++ .../intellij/psi/formatter/xml/SyntheticBlock.java | 15 +++ .../com/intellij/psi/formatter/xml/XmlBlock.java | 15 +++ .../psi/formatter/xml/XmlFormattingPolicy.java | 15 +++ .../com/intellij/psi/formatter/xml/XmlPolicy.java | 15 +++ .../intellij/psi/formatter/xml/XmlTagBlock.java | 15 +++ .../impl/cache/impl/idCache/HtmlIdIndexer.java} | 22 ++-- .../impl/cache/impl/idCache/HtmlTodoIndexer.java} | 22 ++-- .../impl/cache/impl/idCache/XHtmlFilterLexer.java | 15 +++ .../impl/cache/impl/idCache/XHtmlIdIndexer.java} | 22 ++-- .../impl/cache/impl/idCache/XHtmlTodoIndexer.java} | 22 ++-- .../impl/cache/impl/idCache/XmlFilterLexer.java | 15 +++ .../psi/impl/cache/impl/idCache/XmlIdIndexer.java} | 22 ++-- .../impl/cache/impl/idCache/XmlTodoIndexer.java} | 22 ++-- .../html/HtmlConditionalCommentInjector.java | 15 +++ .../psi/impl/source/html/HtmlDocumentImpl.java} | 21 ++-- .../psi/impl/source/html/HtmlFileImpl.java | 15 +++ .../intellij/psi/impl/source/html/HtmlTagImpl.java | 15 +++ .../psi/impl/source/html/ScriptSupportUtil.java | 15 +++ .../html/dtd/HtmlAttributeDescriptorImpl.java | 15 +++ .../source/html/dtd/HtmlElementDescriptorImpl.java | 15 +++ .../impl/source/html/dtd/HtmlNSDescriptorImpl.java | 15 +++ .../impl/source/parsing/xml/HtmlBuilderDriver.java | 16 +++ .../psi/impl/source/parsing/xml/OldXmlParsing.java | 15 +++ .../psi/impl/source/parsing/xml/XmlBuilder.java | 16 +++ .../impl/source/parsing/xml/XmlBuilderDriver.java | 16 +++ .../psi/impl/source/parsing/xml/XmlParser.java | 16 +++ .../psi/impl/source/parsing/xml/XmlParsing.java | 16 +++ .../source/parsing/xml/XmlParsingContext.java} | 22 ++-- .../psi/impl/source/parsing/xml/XmlPsiLexer.java} | 23 +++- .../impl/manipulators/XmlAttributeManipulator.java | 14 ++- .../manipulators/XmlAttributeValueManipulator.java | 15 +++ .../impl/manipulators/XmlTagManipulator.java | 15 +++ .../impl/manipulators/XmlTextManipulator.java | 14 ++- .../impl/manipulators/XmlTokenManipulator.java | 15 +++ .../providers/AttributeValueSelfReference.java | 14 ++- .../providers/BasicAttributeValueReference.java | 14 ++- .../impl/providers/DtdReferencesProvider.java | 15 +++ .../impl/providers/FileBasedUserDataCache.java | 15 +++ .../reference/impl/providers/IdRefReference.java | 15 ++- .../impl/providers/IdReferenceProvider.java | 15 ++- .../impl/providers/SchemaReferencesProvider.java | 15 +++ .../impl/providers/URIReferenceProvider.java | 15 +++ .../impl/providers/XmlValueReference.java | 15 +++ .../psi/impl/source/tree/HtmlFileElement.java | 15 +++ .../psi/impl/source/tree/XmlFileElement.java | 15 +++ .../tree/injected/XmlAttributeLiteralEscaper.java | 15 +++ .../tree/injected/XmlCommentLiteralEscaper.java | 15 +++ .../tree/injected/XmlTextLiteralEscaper.java | 15 +++ .../psi/impl/source/xml/TagNameReference.java | 15 +++ .../psi/impl/source/xml/XmlAttlistDeclImpl.java | 15 +++ .../psi/impl/source/xml/XmlAttributeDeclImpl.java | 15 +++ .../psi/impl/source/xml/XmlAttributeImpl.java | 15 +++ .../psi/impl/source/xml/XmlAttributeValueImpl.java | 15 +++ .../psi/impl/source/xml/XmlCommentImpl.java | 15 +++ .../impl/source/xml/XmlConditionalSectionImpl.java | 15 +++ .../intellij/psi/impl/source/xml/XmlDeclImpl.java | 15 +++ .../psi/impl/source/xml/XmlDoctypeImpl.java | 15 +++ .../psi/impl/source/xml/XmlDocumentImpl.java | 15 +++ .../psi/impl/source/xml/XmlElementChangeUtil.java | 16 +++ .../impl/source/xml/XmlElementContentSpecImpl.java | 15 +++ .../psi/impl/source/xml/XmlElementDeclImpl.java | 15 +++ .../source/xml/XmlElementDescriptorProvider.java} | 16 +-- .../psi/impl/source/xml/XmlElementImpl.java | 16 +++ .../psi/impl/source/xml/XmlEntityDeclImpl.java | 15 +++ .../psi/impl/source/xml/XmlEntityRefImpl.java | 15 +++ .../psi/impl/source/xml/XmlEnumeratedTypeImpl.java | 15 +++ .../intellij/psi/impl/source/xml/XmlFileImpl.java | 15 +++ .../psi/impl/source/xml/XmlMarkupDeclImpl.java} | 25 +++-- .../psi/impl/source/xml/XmlNotationDeclImpl.java | 15 +++ .../source/xml/XmlProcessingInstructionImpl.java | 16 +++ .../psi/impl/source/xml/XmlPrologImpl.java | 15 +++ .../psi/impl/source/xml/XmlPsiPolicy.java} | 17 ++- .../intellij/psi/impl/source/xml/XmlTagImpl.java | 15 +++ .../psi/impl/source/xml/XmlTagValueImpl.java | 15 +++ .../intellij/psi/impl/source/xml/XmlTextImpl.java | 15 +++ .../intellij/psi/impl/source/xml/XmlTokenImpl.java | 15 +++ .../xml/behavior/CDATAOnAnyEncodedPolicy.java | 15 +++ .../source/xml/behavior/DefaultXmlPsiPolicy.java | 15 +++ .../xml/behavior/EncodeEachSymbolPolicy.java | 15 +++ .../psi/impl/source/xml/dtd/DTDElementType.java | 15 +++ .../src/com/intellij/psi/xml/DTDTokenType.java | 15 +++ .../src/com/intellij/psi/xml/XmlChildRole.java | 15 +++ .../src/com/intellij/psi/xml/XmlElementType.java | 15 +++ .../com/intellij/psi/xml/XmlTextElementType.java} | 24 ++--- .../rename/RenameXmlAttributeProcessor.java | 15 +++ ...XmlNonCodeSearchElementDescriptionProvider.java | 15 +++ .../usageView/XmlUsageViewDescriptionProvider.java | 15 +++ .../intellij/vcsUtil/XmlVcsSelectionProvider.java | 15 +++ .../src/com/intellij/xml/DefaultXmlExtension.java | 15 +++ .../xml/XmlAttributeDescriptorsProvider.java | 15 +++ xml/impl/src/com/intellij/xml/XmlExtension.java | 15 +++ .../src/com/intellij/xml/XmlFileTypeFactory.java | 15 +++ .../xml/XmlUndefinedElementFixProvider.java} | 15 ++- .../intellij/xml/actions/ValidateXmlAction.java | 15 +++ .../xml/actions/ValidateXmlActionHandler.java | 15 +++ .../intellij/xml/actions/XmlSplitTagAction.java | 15 +++ .../intellij/xml/actions/xmlbeans/FileUtils.java | 15 +++ .../GenerateInstanceDocumentFromSchemaAction.java | 15 +++ .../GenerateInstanceDocumentFromSchemaDialog.java | 15 +++ .../GenerateSchemaFromInstanceDocumentAction.java | 15 +++ .../GenerateSchemaFromInstanceDocumentDialog.java | 15 +++ .../com/intellij/xml/actions/xmlbeans/UIUtils.java | 15 +++ .../xml/actions/xmlbeans/Xsd2InstanceUtils.java | 15 +++ .../xml/breadcrumbs/BreadcrumbsPsiItem.java | 15 +++ .../xml/breadcrumbs/BreadcrumbsXmlWrapper.java | 15 +++ .../XmlLanguageBreadcrumbsInfoProvider.java | 16 +++ .../xml/impl/BasicXmlAttributeDescriptor.java | 16 +++ .../xml/impl/ExternalDocumentValidator.java | 15 +++ .../xml/impl/XmlAttributeDescriptorEx.java} | 23 ++-- .../src/com/intellij/xml/impl/XmlBraceMatcher.java | 15 +++ .../xml/impl/dtd/BaseXmlElementDescriptorImpl.java | 15 +++ .../xml/impl/dtd/XmlAttributeDescriptorImpl.java | 15 +++ .../xml/impl/dtd/XmlElementDescriptorImpl.java | 15 +++ .../intellij/xml/impl/dtd/XmlNSDescriptorImpl.java | 15 +++ .../xml/impl/schema/AnyXmlAttributeDescriptor.java | 16 +++ .../xml/impl/schema/AnyXmlElementDescriptor.java | 16 +++ .../xml/impl/schema/ComplexTypeDescriptor.java | 15 +++ .../xml/impl/schema/NamedObjectDescriptor.java | 15 +++ .../xml/impl/schema/NullElementDescriptor.java | 16 +++ .../xml/impl/schema/SchemaNSDescriptor.java | 15 +++ .../xml/impl/schema/SimpleTypeDescriptor.java} | 15 +-- .../xml/impl/schema/StdTypeDescriptor.java} | 15 +-- .../intellij/xml/impl/schema/TypeDescriptor.java} | 8 +- .../impl/schema/XmlAttributeDescriptorImpl.java | 15 +++ .../impl/schema/XmlElementDescriptorByType.java | 15 +++ .../xml/impl/schema/XmlElementDescriptorImpl.java | 15 +++ .../xml/impl/schema/XmlNSDescriptorImpl.java | 15 +++ .../xml/index/ExternalResourcesRootsProvider.java | 15 +++ .../xml/index/IndexedRelevantResource.java | 15 +++ .../com/intellij/xml/index/ResourceRelevance.java | 15 +++ xml/impl/src/com/intellij/xml/index/XmlIndex.java | 15 +++ .../com/intellij/xml/index/XmlNamespaceIndex.java | 15 +++ .../com/intellij/xml/index/XmlTagNamesIndex.java | 15 +++ .../com/intellij/xml/index/XsdTagNameBuilder.java | 15 +++ .../xml/refactoring/XmlTagInplaceRenamer.java | 16 +++ .../xml/refactoring/XmlTagRenameDialog.java | 16 +++ .../xml/refactoring/XmlTagRenameHandler.java | 16 +++ .../xml/util/AnchorPathReferenceProvider.java | 15 +++ .../src/com/intellij/xml/util/AnchorReference.java | 15 +++ .../xml/util/CheckDtdReferencesInspection.java | 14 ++- .../intellij/xml/util/CheckEmptyTagInspection.java | 14 ++- .../xml/util/CheckTagEmptyBodyInspection.java | 14 ++- .../util/CheckValidXmlInScriptBodyInspection.java | 14 ++- .../CheckXmlFileWithXercesValidatorInspection.java | 14 ++- .../intellij/xml/util/ColorSampleLookupValue.java | 15 +++ xml/impl/src/com/intellij/xml/util/HtmlUtil.java | 15 +++ .../src/com/intellij/xml/util/UserColorLookup.java | 15 +++ .../com/intellij/xml/util/XIncludeProvider.java | 15 +++ .../intellij/xml/util/XmlApplicationComponent.java | 15 +++ .../xml/util/XmlDeclareIdInCommentAction.java | 15 +++ .../xml/util/XmlDuplicatedIdInspection.java | 15 +++ .../com/intellij/xml/util/XmlElementFactory.java} | 23 ++-- .../src/com/intellij/xml/util/XmlIconProvider.java | 15 ++- .../com/intellij/xml/util/XmlIdContributor.java} | 14 ++- .../com/intellij/xml/util/XmlIncludeHandler.java | 15 +++ .../intellij/xml/util/XmlNSDescriptorSequence.java | 15 +++ .../com/intellij/xml/util/XmlRefCountHolder.java | 15 +++ .../com/intellij/xml/util/XmlResourceResolver.java | 15 +++ xml/impl/src/com/intellij/xml/util/XmlUtil.java | 15 +++ .../CompositeAttributeTagDescriptor.java | 15 +++ .../xml/util/documentation/EntityDescriptor.java | 15 +++ .../documentation/HtmlAttributeDescriptor.java | 15 +++ .../util/documentation/HtmlDescriptorsTable.java | 15 +++ .../documentation/HtmlDocumentationProvider.java | 15 +++ .../xml/util/documentation/HtmlTagDescriptor.java | 15 +++ .../documentation/XHtmlDocumentationProvider.java | 15 +++ .../documentation/XmlDocumentationProvider.java | 15 +++ .../DefaultXmlSuppressionProvider.java | 2 +- .../codeInspection/XmlInspectionGroupNames.java} | 21 ++-- .../XmlSuppressableInspectionTool.java | 2 +- .../codeInspection/XmlSuppressionProvider.java | 2 +- .../ide/browsers/WebBrowserUrlProvider.java | 15 +++ .../ide/browsers/WebBrowserUrlProviders.java | 15 +++ .../xml/XmlStructureViewBuilderProvider.java} | 17 ++- .../xml/XmlStructureViewElementProvider.java} | 20 ++-- .../intellij/javaee/ExternalResourceManager.java | 2 +- .../ResourceRegistrar.java} | 25 +++-- .../intellij/javaee/StandardResourceProvider.java} | 16 +-- xml/openapi/src/com/intellij/javaee/UriUtil.java | 16 +++ .../lang/documentation/DocumentationUtil.java} | 13 +-- .../XmlToken.java => lexer/EmbedmentLexer.java} | 11 +- .../openapi/editor/XmlHighlighterColors.java | 15 +++ .../patterns/XmlAttributeValuePattern.java | 14 ++- .../com/intellij/patterns/XmlElementPattern.java | 14 ++- .../src/com/intellij/patterns/XmlFilePattern.java | 15 +++ .../intellij/patterns/XmlNamedElementPattern.java | 14 ++- .../src/com/intellij/patterns/XmlPatterns.java | 15 ++- .../src/com/intellij/patterns/XmlTagPattern.java | 15 +++ .../src/com/intellij/pom/xml/XmlAspect.java | 2 +- .../src/com/intellij/pom/xml/XmlChangeSet.java | 2 +- .../src/com/intellij/pom/xml/XmlChangeVisitor.java | 2 +- .../com/intellij/pom/xml/XmlChangeVisitorBase.java | 2 +- .../intellij/pom/xml/events/XmlAttributeSet.java | 2 +- .../src/com/intellij/pom/xml/events/XmlChange.java | 2 +- .../pom/xml/events/XmlDocumentChanged.java | 2 +- .../intellij/pom/xml/events/XmlElementChanged.java | 2 +- .../intellij/pom/xml/events/XmlTagChildAdd.java | 2 +- .../pom/xml/events/XmlTagChildChanged.java | 2 +- .../pom/xml/events/XmlTagChildRemoved.java | 2 +- .../intellij/pom/xml/events/XmlTagNameChanged.java | 2 +- .../intellij/pom/xml/events/XmlTextChanged.java | 2 +- .../src/com/intellij/psi/XmlElementFactory.java | 15 +++ .../src/com/intellij/psi/XmlElementVisitor.java | 2 +- .../intellij/psi/XmlRecursiveElementVisitor.java | 16 +++ .../psi/filters/position/NamespaceFilter.java | 15 +++ xml/openapi/src/com/intellij/psi/html/HtmlTag.java | 2 +- .../com/intellij/psi/tree/xml/IDTDElementType.java | 2 +- .../com/intellij/psi/tree/xml/IXmlElementType.java | 2 +- .../intellij/psi/tree/xml/IXmlLeafElementType.java | 2 +- .../src/com/intellij/psi/xml/XmlAttlistDecl.java | 2 +- .../src/com/intellij/psi/xml/XmlAttribute.java | 2 +- .../src/com/intellij/psi/xml/XmlAttributeDecl.java | 2 +- .../com/intellij/psi/xml/XmlAttributeValue.java | 2 +- .../src/com/intellij/psi/xml/XmlComment.java | 2 +- .../intellij/psi/xml/XmlConditionalSection.java | 2 +- xml/openapi/src/com/intellij/psi/xml/XmlDecl.java | 2 +- .../src/com/intellij/psi/xml/XmlDoctype.java | 2 +- .../src/com/intellij/psi/xml/XmlDocument.java | 2 +- .../src/com/intellij/psi/xml/XmlElement.java | 2 +- .../intellij/psi/xml/XmlElementContentSpec.java | 2 +- .../src/com/intellij/psi/xml/XmlElementDecl.java | 2 +- .../src/com/intellij/psi/xml/XmlEntityDecl.java | 2 +- .../src/com/intellij/psi/xml/XmlEntityRef.java | 2 +- .../com/intellij/psi/xml/XmlEnumeratedType.java | 2 +- xml/openapi/src/com/intellij/psi/xml/XmlFile.java | 2 +- .../intellij/psi/xml/XmlFileNSInfoProvider.java | 2 +- .../src/com/intellij/psi/xml/XmlMarkupDecl.java | 2 +- .../src/com/intellij/psi/xml/XmlNotationDecl.java | 2 +- .../intellij/psi/xml/XmlProcessingInstruction.java | 2 +- .../src/com/intellij/psi/xml/XmlProlog.java | 2 +- xml/openapi/src/com/intellij/psi/xml/XmlTag.java | 2 +- .../src/com/intellij/psi/xml/XmlTagChild.java | 2 +- .../src/com/intellij/psi/xml/XmlTagValue.java | 2 +- xml/openapi/src/com/intellij/psi/xml/XmlText.java | 2 +- xml/openapi/src/com/intellij/psi/xml/XmlToken.java | 2 +- .../src/com/intellij/psi/xml/XmlTokenType.java | 2 +- .../com/intellij/xml/XmlAttributeDescriptor.java | 2 +- xml/openapi/src/com/intellij/xml/XmlBundle.java | 2 +- .../src/com/intellij/xml/XmlElementDescriptor.java | 2 +- ...=> XmlElementDescriptorAwareAboutChildren.java} | 7 +- .../xml/XmlElementDescriptorWithCDataContent.java | 2 +- .../src/com/intellij/xml/XmlNSDescriptor.java | 2 +- .../src/com/intellij/xml/XmlSchemaProvider.java | 2 +- .../xml/breadcrumbs/BreadcrumbsInfoProvider.java | 16 +++ .../intellij/xml/breadcrumbs/BreadcrumbsItem.java} | 16 +-- .../xml/breadcrumbs/BreadcrumbsItemListener.java} | 13 ++- .../src/com/intellij/xml/util/XmlTagTextUtil.java | 2 +- .../src/com/intellij/xml/util/XmlTagUtil.java | 2 +- 710 files changed, 6994 insertions(+), 1416 deletions(-) copy xml/{dom-openapi/src/com/intellij/util/xml/NamedEnum.java => dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightStatus.java} (77%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java => dom-impl/src/com/intellij/util/xml/impl/AbstractCollectionChildDescription.java} (53%) copy xml/{dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java => dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java} (58%) copy xml/{openapi/src/com/intellij/psi/xml/XmlTagChild.java => dom-impl/src/com/intellij/util/xml/impl/DomParentStrategy.java} (57%) copy xml/{dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java => dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java} (50%) copy xml/dom-openapi/src/com/intellij/util/xml/{MutableGenericValue.java => DefinesXml.java} (74%) copy xml/dom-openapi/src/com/intellij/util/xml/{ScopeProvider.java => DomIconProvider.java} (57%) copy xml/{openapi/src/com/intellij/psi/xml/XmlTagChild.java => dom-openapi/src/com/intellij/util/xml/DomReferenceInjector.java} (61%) copy xml/dom-openapi/src/com/intellij/util/xml/{GenericDomValue.java => EvaluatedXmlName.java} (60%) copy xml/dom-openapi/src/com/intellij/util/xml/{events/ElementUndefinedEvent.java => actions/generate/DomTemplateRunner.java} (52%) copy xml/dom-openapi/src/com/intellij/util/xml/{ui/EditedElementDescription.java => model/SimpleModelFactory.java} (65%) copy xml/dom-openapi/src/com/intellij/util/xml/{DomFileElement.java => model/impl/CachedDomModelFactory.java} (58%) copy xml/{dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java => impl/src/com/intellij/application/options/XmlOptionsApplicabilityFilter.java} (65%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java => impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java} (51%) copy xml/{openapi/src/com/intellij/psi/html/HtmlTag.java => impl/src/com/intellij/codeInsight/completion/XHtmlCompletionData.java} (69%) copy xml/{openapi/src/com/intellij/psi/xml/XmlConditionalSection.java => impl/src/com/intellij/codeInsight/editorActions/XmlBasicWordSelectionFilter.java} (58%) copy xml/{dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java => impl/src/com/intellij/codeInsight/editorActions/XmlElementSelectioner.java} (67%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java => impl/src/com/intellij/codeInsight/template/XmlContextType.java} (59%) copy xml/{dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java => impl/src/com/intellij/codeInsight/template/XmlDefaultLiveTemplatesProvider.java} (61%) copy xml/{dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java => impl/src/com/intellij/ide/actions/CreateXhtmlAction.java} (60%) copy xml/{dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java => impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java} (59%) rewrite xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java (66%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java => impl/src/com/intellij/ide/highlighter/HtmlHighlighterFactory.java} (51%) rewrite xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java (66%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/ide/highlighter/XmlHighlighterFactory.java} (56%) copy xml/{openapi/src/com/intellij/psi/xml/XmlConditionalSection.java => impl/src/com/intellij/ide/util/treeView/XmlDoctypeNodeDescriptor.java} (58%) copy xml/{openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java => impl/src/com/intellij/javaee/ExternalResourceListener.java} (77%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java => impl/src/com/intellij/lang/xml/XmlCommenter.java} (53%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java => impl/src/com/intellij/lexer/XHtmlHighlightingLexer.java} (59%) copy xml/{openapi/src/com/intellij/psi/xml/XmlConditionalSection.java => impl/src/com/intellij/lexer/XHtmlLexer.java} (63%) copy xml/{openapi/src/com/intellij/psi/xml/XmlConditionalSection.java => impl/src/com/intellij/psi/filters/XmlTagFilter.java} (56%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java} (52%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java} (52%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java} (52%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java} (52%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java} (54%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java} (54%) copy xml/{openapi/src/com/intellij/psi/html/HtmlTag.java => impl/src/com/intellij/psi/impl/source/html/HtmlDocumentImpl.java} (57%) copy xml/{dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java => impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsingContext.java} (55%) copy xml/{openapi/src/com/intellij/psi/xml/XmlToken.java => impl/src/com/intellij/psi/impl/source/parsing/xml/XmlPsiLexer.java} (56%) copy xml/{dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java => impl/src/com/intellij/psi/impl/source/xml/XmlElementDescriptorProvider.java} (57%) copy xml/{openapi/src/com/intellij/psi/xml/XmlElementDecl.java => impl/src/com/intellij/psi/impl/source/xml/XmlMarkupDeclImpl.java} (54%) copy xml/{dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java => impl/src/com/intellij/psi/impl/source/xml/XmlPsiPolicy.java} (68%) copy xml/{openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java => impl/src/com/intellij/psi/xml/XmlTextElementType.java} (64%) copy xml/{openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java => impl/src/com/intellij/xml/XmlUndefinedElementFixProvider.java} (67%) copy xml/{openapi/src/com/intellij/psi/xml/XmlTagChild.java => impl/src/com/intellij/xml/impl/XmlAttributeDescriptorEx.java} (61%) copy xml/{openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java => impl/src/com/intellij/xml/impl/schema/SimpleTypeDescriptor.java} (73%) copy xml/{openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java => impl/src/com/intellij/xml/impl/schema/StdTypeDescriptor.java} (74%) copy xml/{openapi/src/com/intellij/psi/xml/XmlDecl.java => impl/src/com/intellij/xml/impl/schema/TypeDescriptor.java} (79%) copy xml/{dom-openapi/src/com/intellij/util/xml/TypeChooser.java => impl/src/com/intellij/xml/util/XmlElementFactory.java} (54%) copy xml/{openapi/src/com/intellij/xml/util/XmlTagTextUtil.java => impl/src/com/intellij/xml/util/XmlIdContributor.java} (62%) copy xml/{dom-openapi/src/com/intellij/util/xml/GenericDomValue.java => openapi/src/com/intellij/codeInspection/XmlInspectionGroupNames.java} (63%) copy xml/openapi/src/com/intellij/{psi/xml/XmlTagChild.java => ide/structureView/xml/XmlStructureViewBuilderProvider.java} (60%) copy xml/openapi/src/com/intellij/{psi/xml/XmlTagChild.java => ide/structureView/xml/XmlStructureViewElementProvider.java} (58%) copy xml/openapi/src/com/intellij/{psi/tree/xml/IDTDElementType.java => javaee/ResourceRegistrar.java} (55%) copy xml/{dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java => openapi/src/com/intellij/javaee/StandardResourceProvider.java} (60%) copy xml/{dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java => openapi/src/com/intellij/lang/documentation/DocumentationUtil.java} (61%) copy xml/openapi/src/com/intellij/{psi/xml/XmlToken.java => lexer/EmbedmentLexer.java} (76%) copy xml/openapi/src/com/intellij/xml/{XmlElementDescriptorWithCDataContent.java => XmlElementDescriptorAwareAboutChildren.java} (75%) copy xml/{dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java => openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItem.java} (71%) copy xml/{dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java => openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItemListener.java} (71%) diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomDocumentationProvider.java b/xml/dom-impl/src/com/intellij/util/xml/DomDocumentationProvider.java index 55a76ee297..ed8cec781d 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomDocumentationProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomDocumentationProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml; import com.intellij.lang.documentation.DocumentationProvider; diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java index ddbbf16276..8bfbb34197 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml; diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java index b8eb8bb37e..34efdc1338 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomUsageTypeProvider.java b/xml/dom-impl/src/com/intellij/util/xml/DomUsageTypeProvider.java index aa504d73a9..63e5943715 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomUsageTypeProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomUsageTypeProvider.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml; diff --git a/xml/dom-impl/src/com/intellij/util/xml/ElementPresentationManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/ElementPresentationManagerImpl.java index 432221e2d1..0d169d7f62 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ElementPresentationManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ElementPresentationManagerImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml; diff --git a/xml/dom-impl/src/com/intellij/util/xml/InvocationStack.java b/xml/dom-impl/src/com/intellij/util/xml/InvocationStack.java index 7681d98117..cebffd6d4f 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/InvocationStack.java +++ b/xml/dom-impl/src/com/intellij/util/xml/InvocationStack.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptorImpl.java index f4745641c9..e6ea34fe28 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptorImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java index 5d823f86c7..d6a79f0b6e 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java index 14f523b568..38363c0cc8 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java index 63ecf5655a..0d4c0385cc 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptorImpl.java index d9f1792a45..725fab9176 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptorImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java index a235221fbc..294ef8b023 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsHighlightingUtil.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsHighlightingUtil.java index f3bdaad29e..649524ceeb 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsHighlightingUtil.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsHighlightingUtil.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolderImpl.java index 2de74776f7..898a120e8a 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolderImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolderImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightStatus.java similarity index 77% copy from xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java copy to xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightStatus.java index 4c9b4a0b5a..fb1cab74a1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.util.xml.highlighting; /** * @author peter */ -public interface NamedEnum { - String getValue(); +public enum DomHighlightStatus { + NONE, + ANNOTATORS_FINISHED, + INSPECTIONS_FINISHED } diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java index f440fe539c..8f94a1e4ff 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockAnnotatingDomInspection.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockAnnotatingDomInspection.java index 65f1fbba39..0f9863299c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockAnnotatingDomInspection.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockAnnotatingDomInspection.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockDomInspection.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockDomInspection.java index d2dd56178e..85460928a0 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockDomInspection.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/MockDomInspection.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractCollectionChildDescription.java similarity index 53% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java copy to xml/dom-impl/src/com/intellij/util/xml/impl/AbstractCollectionChildDescription.java index 3450dfc540..e409a702f5 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractCollectionChildDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,22 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.util.xml.impl; -import com.intellij.util.xml.DomElement; +import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlFile; -import org.jetbrains.annotations.Nullable; +import com.intellij.util.xml.reflect.AbstractDomChildrenDescription; +import com.intellij.util.xml.EvaluatedXmlName; + +import java.util.List; /** * @author peter */ -public abstract class EditedElementDescription { - @Nullable - public XmlFile getEditedFile() { - return null; - } - @Nullable - public abstract T find(); - public abstract void initialize(T element); - public abstract T addElement(); +public interface AbstractCollectionChildDescription extends AbstractDomChildrenDescription { + List getSubTags(DomInvocationHandler handler, final XmlTag[] subTags, final XmlFile file); + EvaluatedXmlName createEvaluatedXmlName(DomInvocationHandler parent, XmlTag childTag); } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractDomChildDescriptionImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractDomChildDescriptionImpl.java index b3bb0d94d4..e100ccb0a9 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractDomChildDescriptionImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AbstractDomChildDescriptionImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java index b6d9a0d113..85793f8269 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/BasicDomElementPresentation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/BasicDomElementPresentation.java index 8b9d5fad50..61e796941c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/BasicDomElementPresentation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/BasicDomElementPresentation.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.impl; import com.intellij.openapi.util.IconLoader; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java index 61ffb553c2..2130a419e0 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java index 92d5c4f113..fcd6248614 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/CustomDomChildrenDescriptionImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/CustomDomChildrenDescriptionImpl.java index 29c848dde9..bbb4872859 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/CustomDomChildrenDescriptionImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/CustomDomChildrenDescriptionImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomAnnotator.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomAnnotator.java index 2e01b085eb..cf14a4be07 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomAnnotator.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomAnnotator.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java index eddab5c4da..3972bc2650 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java similarity index 58% copy from xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java copy to xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java index afb1446bfc..d93d41cb6e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,28 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.reflect; +package com.intellij.util.xml.impl; +import com.intellij.openapi.project.DumbAware; import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.DomNameStrategy; -import com.intellij.util.xml.XmlName; +import com.intellij.util.xml.ElementPresentationManager; +import com.intellij.util.xml.DomIconProvider; import org.jetbrains.annotations.NotNull; +import javax.swing.*; + /** * @author peter */ -public interface DomChildrenDescription extends AbstractDomChildrenDescription { - - @NotNull - XmlName getXmlName(); - - @NotNull - String getXmlElementName(); - - @NotNull - String getCommonPresentableName(@NotNull DomNameStrategy strategy); - - @NotNull - String getCommonPresentableName(@NotNull DomElement parent); - +public class DefaultDomTargetIconProvider extends DomIconProvider implements DumbAware { + public Icon getIcon(@NotNull DomElement element, int flags) { + return ElementPresentationManager.getIconOld(element); + } } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java index e636dafee1..ebc9f60714 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java index 6f4a93f34f..15dcfb6413 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java index 498da0c1ac..c0c4c41fb0 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomDeclarationSearcher.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomDeclarationSearcher.java index b9f4453277..3a79133cf9 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomDeclarationSearcher.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomDeclarationSearcher.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomDescriptorProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomDescriptorProvider.java index 4d9ba1787c..5312801394 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomDescriptorProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomDescriptorProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.impl; import com.intellij.psi.impl.source.xml.XmlElementDescriptorProvider; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomElementsNavigationManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomElementsNavigationManagerImpl.java index 924e0df8f4..6744005c2c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomElementsNavigationManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomElementsNavigationManagerImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomGenericInfoEx.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomGenericInfoEx.java index c1e1517977..8ccaca91a5 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomGenericInfoEx.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomGenericInfoEx.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java index 573a10b33d..4045aed844 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomParentStrategy.java similarity index 57% copy from xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java copy to xml/dom-impl/src/com/intellij/util/xml/impl/DomParentStrategy.java index ace8c1f21d..dbec29a6db 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomParentStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.util.xml.impl; +import com.intellij.psi.xml.XmlElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface XmlTagChild extends XmlElement{ - XmlTagChild[] EMPTY_ARRAY = new XmlTagChild[0]; - @Nullable - XmlTag getParentTag(); +/** + * @author peter + */ +public interface DomParentStrategy { + @Nullable DomInvocationHandler getParentHandler(); @Nullable - XmlTagChild getNextSiblingInTag(); - @Nullable - XmlTagChild getPrevSiblingInTag(); + XmlElement getXmlElement(); + + @NotNull DomParentStrategy refreshStrategy(final DomInvocationHandler handler); + + @NotNull DomParentStrategy setXmlElement(@NotNull XmlElement element); + + @NotNull DomParentStrategy clearXmlElement(); + + boolean isValid(); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java similarity index 50% copy from xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java copy to xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java index 7c7c804436..8dbfe5f73b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,26 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.events; +package com.intellij.util.xml.impl; -import com.intellij.util.xml.events.ElementChangedEvent; -import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.DomEventVisitor; +import com.intellij.psi.PsiReferenceContributor; +import com.intellij.psi.PsiReferenceRegistrar; +import com.intellij.patterns.XmlPatterns; /** * @author peter */ -public class ElementUndefinedEvent extends ElementChangedEvent { - - public ElementUndefinedEvent(final DomElement element) { - super(element); - } - - public String toString() { - return "Undefined " + getElement(); - } - - public void accept(DomEventVisitor visitor) { - visitor.visitElementUndefined(this); +public class DomReferenceContributor extends PsiReferenceContributor{ + public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + registrar.registerReferenceProvider(XmlPatterns.xmlTag(), new GenericValueReferenceProvider()); + registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue(), new GenericValueReferenceProvider()); } } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java index e2ea60ce0d..6926d07197 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java index a1153c6c81..8b2a4e1d06 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomTemplateRunnerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomTemplateRunnerImpl.java index aa2cbd0c9a..2b3c5b29e5 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomTemplateRunnerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomTemplateRunnerImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.impl; import com.intellij.codeInsight.template.Template; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DummyEvaluatedXmlName.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DummyEvaluatedXmlName.java index d630751ebb..da6f6e940f 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DummyEvaluatedXmlName.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DummyEvaluatedXmlName.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DynamicGenericInfo.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DynamicGenericInfo.java index aea740f0d5..dc2189e6b8 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DynamicGenericInfo.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DynamicGenericInfo.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java index 1d33a00481..92f2b2f95a 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java index 641a75b9fc..32d6316761 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java index 404d050b7a..52ec66d3b4 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java index 0df095b13f..4a9a36133d 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GetCompositeCollectionInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GetCompositeCollectionInvocation.java index a7dd24c6d0..9e2c6ca67a 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GetCompositeCollectionInvocation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GetCompositeCollectionInvocation.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ImplementationClassCache.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ImplementationClassCache.java index 57d66813e2..baa27922a7 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/ImplementationClassCache.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ImplementationClassCache.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/MockDomFileDescription.java b/xml/dom-impl/src/com/intellij/util/xml/impl/MockDomFileDescription.java index 6e9002542f..cad1544133 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/MockDomFileDescription.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/MockDomFileDescription.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java index 2a7188d7fa..a6f1b29831 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/PropertyAccessorInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/PropertyAccessorInvocation.java index beef65462c..baa652c0f7 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/PropertyAccessorInvocation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/PropertyAccessorInvocation.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java index 9a798baa61..cfd80b5049 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java index c1bdff2d69..48a5ce1cc8 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java index 8bd3e5c48a..b2fb795e70 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java index 09437f9c4a..c82e555af0 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/VisitorDescription.java b/xml/dom-impl/src/com/intellij/util/xml/impl/VisitorDescription.java index 78ac68a9e4..b716e23ed2 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/VisitorDescription.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/VisitorDescription.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.impl; diff --git a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java index 37b50fcbce..45ee3aa8c1 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java +++ b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.reflect; diff --git a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionImpl.java b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionImpl.java index db2b713943..8fe4fd7f87 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.reflect; diff --git a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java index 536c46c4e9..fd43c40589 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.reflect; diff --git a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureTreeElement.java b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureTreeElement.java index 1542ae553a..8e8a06e25c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureTreeElement.java +++ b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureTreeElement.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.structure; diff --git a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java index 0f2704b732..c1fe629ef4 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.structure; diff --git a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewTreeModel.java b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewTreeModel.java index b6e3b65168..b6bdc8944c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewTreeModel.java +++ b/xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewTreeModel.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.structure; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddDomElementActionGroup.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddDomElementActionGroup.java index efc66b8564..67275485eb 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddDomElementActionGroup.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddDomElementActionGroup.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddElementInCollectionAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddElementInCollectionAction.java index 0d32908371..f8d9c21d88 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddElementInCollectionAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/AddElementInCollectionAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/BaseDomTreeAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/BaseDomTreeAction.java index 127c5564c5..c59a8ec1df 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/BaseDomTreeAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/BaseDomTreeAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java index 98bedac285..ad0f561f69 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java index ba1a97a1ec..66f923e8bd 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java index e0bc0374e0..256a397e44 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.tree.actions; diff --git a/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java b/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java index 660fd463b9..3d47784530 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.ui; diff --git a/xml/dom-impl/src/com/intellij/util/xml/ui/EditorTextFieldControl.java b/xml/dom-impl/src/com/intellij/util/xml/ui/EditorTextFieldControl.java index e96c5ae45a..eb27a93d0e 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ui/EditorTextFieldControl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ui/EditorTextFieldControl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.ui; diff --git a/xml/dom-impl/src/com/intellij/util/xml/ui/TextControl.java b/xml/dom-impl/src/com/intellij/util/xml/ui/TextControl.java index c95b63b679..485b2b049e 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ui/TextControl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ui/TextControl.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.ui; diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java index 5b474b3d67..c66368af52 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dom; import com.intellij.openapi.util.text.StringUtil; diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java index 5e1fcffaa0..d16e6d3e4a 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dom; import com.intellij.openapi.util.Key; diff --git a/xml/dom-openapi/src/com/intellij/javaee/web/PsiReferenceConverter.java b/xml/dom-openapi/src/com/intellij/javaee/web/PsiReferenceConverter.java index 9a74881baf..c1db0ed109 100644 --- a/xml/dom-openapi/src/com/intellij/javaee/web/PsiReferenceConverter.java +++ b/xml/dom-openapi/src/com/intellij/javaee/web/PsiReferenceConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/patterns/DomElementPattern.java b/xml/dom-openapi/src/com/intellij/patterns/DomElementPattern.java index f57eb22f61..e68cf0d0e8 100644 --- a/xml/dom-openapi/src/com/intellij/patterns/DomElementPattern.java +++ b/xml/dom-openapi/src/com/intellij/patterns/DomElementPattern.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/dom-openapi/src/com/intellij/patterns/DomPatterns.java b/xml/dom-openapi/src/com/intellij/patterns/DomPatterns.java index f7d3c7cc06..a5f2b3f8c1 100644 --- a/xml/dom-openapi/src/com/intellij/patterns/DomPatterns.java +++ b/xml/dom-openapi/src/com/intellij/patterns/DomPatterns.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/dom-openapi/src/com/intellij/patterns/GenericDomValuePattern.java b/xml/dom-openapi/src/com/intellij/patterns/GenericDomValuePattern.java index edc00114db..f02965b183 100644 --- a/xml/dom-openapi/src/com/intellij/patterns/GenericDomValuePattern.java +++ b/xml/dom-openapi/src/com/intellij/patterns/GenericDomValuePattern.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java index d490b2fd96..dd2c03f0bb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java b/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java index bf35ad77a0..8892817e70 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Attribute.java b/xml/dom-openapi/src/com/intellij/util/xml/Attribute.java index f2707c47cc..6e4cf601eb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Attribute.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Attribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Convert.java b/xml/dom-openapi/src/com/intellij/util/xml/Convert.java index e79bfa4721..1b7e1e776a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Convert.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Convert.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java b/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java index 10142090fa..fb1ce54f78 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Converter.java b/xml/dom-openapi/src/com/intellij/util/xml/Converter.java index 08821c8285..48a02fc438 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Converter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Converter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ConverterManager.java b/xml/dom-openapi/src/com/intellij/util/xml/ConverterManager.java index a62356fc74..4763d6ca7e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ConverterManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ConverterManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/CustomChildren.java b/xml/dom-openapi/src/com/intellij/util/xml/CustomChildren.java index 231683f811..b0c46a026b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/CustomChildren.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/CustomChildren.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/CustomReferenceConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/CustomReferenceConverter.java index caf026b668..096fdadc0c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/CustomReferenceConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/CustomReferenceConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java b/xml/dom-openapi/src/com/intellij/util/xml/DefinesXml.java similarity index 74% copy from xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java copy to xml/dom-openapi/src/com/intellij/util/xml/DefinesXml.java index c9d67b9b7c..c1d087e128 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DefinesXml.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.util.xml; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** - * @author Gregory.Shrago + * @author mike */ -public interface MutableGenericValue extends GenericValue { - - void setStringValue(String value); - - void setValue(T value); - +@Retention(RetentionPolicy.RUNTIME) +public @interface DefinesXml { } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomBundle.java b/xml/dom-openapi/src/com/intellij/util/xml/DomBundle.java index 555063013c..b1379dc945 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomBundle.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomChangeAdapter.java b/xml/dom-openapi/src/com/intellij/util/xml/DomChangeAdapter.java index b86b136704..591f71e788 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomChangeAdapter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomChangeAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomElement.java b/xml/dom-openapi/src/com/intellij/util/xml/DomElement.java index 47f5ebe06d..4794a4ad51 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomElement.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomElementNavigationProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/DomElementNavigationProvider.java index 18b6c76bb4..c6d291ffbb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomElementNavigationProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomElementNavigationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomElementPresentation.java b/xml/dom-openapi/src/com/intellij/util/xml/DomElementPresentation.java index 25cc9aa061..1e034452ad 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomElementPresentation.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomElementPresentation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomElementVisitor.java b/xml/dom-openapi/src/com/intellij/util/xml/DomElementVisitor.java index 7e3f1620bf..450fcac2d8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomElementVisitor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomElementVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomElementsNavigationManager.java b/xml/dom-openapi/src/com/intellij/util/xml/DomElementsNavigationManager.java index cf16afb110..84952daec8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomElementsNavigationManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomElementsNavigationManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomEventAdapter.java b/xml/dom-openapi/src/com/intellij/util/xml/DomEventAdapter.java index 925e44a700..7f1cea34d3 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomEventAdapter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomEventAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomEventListener.java b/xml/dom-openapi/src/com/intellij/util/xml/DomEventListener.java index 9e4646d4b7..d6c8d3f5d0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomEventListener.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomEventVisitor.java b/xml/dom-openapi/src/com/intellij/util/xml/DomEventVisitor.java index f64b8b7154..486eba0c55 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomEventVisitor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomEventVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomFileDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/DomFileDescription.java index c69a3c7810..5a9e82307d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomFileDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomFileDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java b/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java index 907b4d631c..86972215cd 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/DomIconProvider.java similarity index 57% copy from xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java copy to xml/dom-openapi/src/com/intellij/util/xml/DomIconProvider.java index e1b63e9618..6c76883886 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomIconProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -15,24 +15,24 @@ */ package com.intellij.util.xml; +import com.intellij.pom.PomIconProvider; +import com.intellij.pom.PomTarget; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.*; + /** - * Should be stateless, since its instances are cached. * @author peter - * @see Scope */ -public abstract class ScopeProvider { +public abstract class DomIconProvider extends PomIconProvider { + public Icon getIcon(@NotNull PomTarget target, int flags) { + if (target instanceof DomTarget) { + return getIcon(((DomTarget)target).getDomElement(), flags); + } + return null; + } - /** - * @param element element - * @return scope to search within. - * For uniqueness checking should return element, whose direct children names will be compared. - * Basically it's parameter element's parent: {@link ParentScopeProvider}. - * Searches within all children of returned element. - */ @Nullable - public abstract DomElement getScope(@NotNull DomElement element); - -} + public abstract Icon getIcon(@NotNull DomElement element, int flags); +} \ No newline at end of file diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomManager.java b/xml/dom-openapi/src/com/intellij/util/xml/DomManager.java index bffcf2808e..0ac23912c9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomMetaData.java b/xml/dom-openapi/src/com/intellij/util/xml/DomMetaData.java index 7b6b90e1a6..0975c4a048 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomMetaData.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomMetaData.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomNameStrategy.java b/xml/dom-openapi/src/com/intellij/util/xml/DomNameStrategy.java index 32f7232eec..5802b8eabd 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomNameStrategy.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomNameStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/dom-openapi/src/com/intellij/util/xml/DomReferenceInjector.java similarity index 61% copy from xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java copy to xml/dom-openapi/src/com/intellij/util/xml/DomReferenceInjector.java index ace8c1f21d..a89fdf12df 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomReferenceInjector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.util.xml; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface XmlTagChild extends XmlElement{ - XmlTagChild[] EMPTY_ARRAY = new XmlTagChild[0]; - @Nullable - XmlTag getParentTag(); +public interface DomReferenceInjector { + @Nullable String resolveString(@Nullable String unresolvedText, @NotNull ConvertContext context); - @Nullable - XmlTagChild getNextSiblingInTag(); - @Nullable - XmlTagChild getPrevSiblingInTag(); + @NotNull PsiReference[] inject(@Nullable String unresolvedText, @NotNull PsiElement element, @NotNull ConvertContext context); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java index 4ffc561843..bd2d052da8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java index dbeec31991..ba18c9677a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomService.java b/xml/dom-openapi/src/com/intellij/util/xml/DomService.java index 9602e80850..3032284a17 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomService.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java b/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java index a4f9fa9063..b7dbb4bc93 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java @@ -1,17 +1,17 @@ /* * Copyright 2000-2009 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 + * 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 + * 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. + * 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.util.xml; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentation.java b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentation.java index 14d61888ae..9a3af603c5 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentation.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java index dd766be3a5..cfc1a45535 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java b/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlName.java similarity index 60% copy from xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java copy to xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlName.java index ee02bfccad..eb8a751f08 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlName.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -15,19 +15,22 @@ */ package com.intellij.util.xml; +import com.intellij.psi.xml.XmlElement; +import com.intellij.psi.xml.XmlFile; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; /** * @author peter */ -public interface GenericDomValue extends DomElement, MutableGenericValue{ +public interface EvaluatedXmlName { - @NotNull - Converter getConverter(); + XmlName getXmlName(); - @TagValue - void setStringValue(String value); + EvaluatedXmlName evaluateChildName(@NotNull XmlName name); - void setValue(T value); + boolean isNamespaceAllowed(String namespace, final XmlFile file); + @NotNull @NonNls + String getNamespace(@NotNull XmlElement parentElement, final XmlFile file); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java b/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java index c23a4eaab4..08618de386 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java b/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java index ee02bfccad..aeb416cd5d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/GenericValue.java b/xml/dom-openapi/src/com/intellij/util/xml/GenericValue.java index 6a248611b5..a1075aff91 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/GenericValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/GenericValueUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/GenericValueUtil.java index 73bab383e2..6085c20e75 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericValueUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/GenericValueUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/HyphenNameStrategy.java b/xml/dom-openapi/src/com/intellij/util/xml/HyphenNameStrategy.java index 67d8033446..2242e0f7a0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/HyphenNameStrategy.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/HyphenNameStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Implementation.java b/xml/dom-openapi/src/com/intellij/util/xml/Implementation.java index 234ea991b1..55f17524e3 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Implementation.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Implementation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Intersect.java b/xml/dom-openapi/src/com/intellij/util/xml/Intersect.java index 44e36c0644..f70a86dd15 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Intersect.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Intersect.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java index 81c1de4b40..fc3348566c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/JavaMethodSignature.java b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethodSignature.java index 492d5499ab..990303640e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethodSignature.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethodSignature.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/JavaNameStrategy.java b/xml/dom-openapi/src/com/intellij/util/xml/JavaNameStrategy.java index a6e64439e9..7d9429c77d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/JavaNameStrategy.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/JavaNameStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/MergedObject.java b/xml/dom-openapi/src/com/intellij/util/xml/MergedObject.java index ce871037bc..a68ae24e46 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/MergedObject.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/MergedObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/MergingFileDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/MergingFileDescription.java index a7c9c63748..1dbe3d4a35 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/MergingFileDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/MergingFileDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ModelMerger.java b/xml/dom-openapi/src/com/intellij/util/xml/ModelMerger.java index 116c00256f..b8f9c97ced 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ModelMerger.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ModelMerger.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ModelMergerUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/ModelMergerUtil.java index a44fc0b766..07fdd48f78 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ModelMergerUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ModelMergerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ModuleContentRootSearchScope.java b/xml/dom-openapi/src/com/intellij/util/xml/ModuleContentRootSearchScope.java index 4ec1477ed1..ad52b8b14d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ModuleContentRootSearchScope.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ModuleContentRootSearchScope.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml; import com.intellij.psi.search.GlobalSearchScope; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java b/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java index c9d67b9b7c..7197fdc6d8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/NameStrategy.java b/xml/dom-openapi/src/com/intellij/util/xml/NameStrategy.java index 7b22b96f93..b6d29f7f90 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NameStrategy.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/NameStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/NameStrategyForAttributes.java b/xml/dom-openapi/src/com/intellij/util/xml/NameStrategyForAttributes.java index 78791a32ed..de57f21ca6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NameStrategyForAttributes.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/NameStrategyForAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/NameValue.java b/xml/dom-openapi/src/com/intellij/util/xml/NameValue.java index f24f898f42..c531917d3c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NameValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/NameValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java b/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java index 4c9b4a0b5a..ffd845abe8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/NamedEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/NamedEnumUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/NamedEnumUtil.java index 76041b7364..060a7a5c4f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/NamedEnumUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/NamedEnumUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Namespace.java b/xml/dom-openapi/src/com/intellij/util/xml/Namespace.java index 708dc4e389..f620c76163 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Namespace.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Namespace.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java index 79b45fea3a..c84fa31631 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/PrimaryKey.java b/xml/dom-openapi/src/com/intellij/util/xml/PrimaryKey.java index e921c389b6..2ef451e7c9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/PrimaryKey.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/PrimaryKey.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/PropertyAccessor.java b/xml/dom-openapi/src/com/intellij/util/xml/PropertyAccessor.java index 6e4a58dcc6..248b360be8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/PropertyAccessor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/PropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Referencing.java b/xml/dom-openapi/src/com/intellij/util/xml/Referencing.java index ea30796b0f..e472f084e1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Referencing.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Referencing.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Required.java b/xml/dom-openapi/src/com/intellij/util/xml/Required.java index 11ad7d5f47..fda53fe0c9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Required.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Required.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Resolve.java b/xml/dom-openapi/src/com/intellij/util/xml/Resolve.java index 547e482e55..1f0936bcff 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Resolve.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Resolve.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java index c725dcbb0b..79b0ae17fb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java index 9d144e8126..79e19230c1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/Scope.java b/xml/dom-openapi/src/com/intellij/util/xml/Scope.java index 6e22b9add7..b4f0bca9d2 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/Scope.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/Scope.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java index e1b63e9618..275813249a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ScopeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/StableElement.java b/xml/dom-openapi/src/com/intellij/util/xml/StableElement.java index fc31f032bb..88e409da42 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/StableElement.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/StableElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/SubTag.java b/xml/dom-openapi/src/com/intellij/util/xml/SubTag.java index 4991cf88f8..6ae8865232 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/SubTag.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/SubTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/SubTagList.java b/xml/dom-openapi/src/com/intellij/util/xml/SubTagList.java index e2591b8ea6..059bf52eb0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/SubTagList.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/SubTagList.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/SubTagsList.java b/xml/dom-openapi/src/com/intellij/util/xml/SubTagsList.java index ea5160079b..30e8599160 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/SubTagsList.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/SubTagsList.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/TagValue.java b/xml/dom-openapi/src/com/intellij/util/xml/TagValue.java index af932f06c7..1dd245b2e6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/TagValue.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/TagValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java b/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java index 8188bdbfae..32b322df6d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/TypeChooserManager.java b/xml/dom-openapi/src/com/intellij/util/xml/TypeChooserManager.java index f29e75744b..e16c1b1cec 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/TypeChooserManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/TypeChooserManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/WrappingConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/WrappingConverter.java index eb037818e8..56214eb4dc 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/WrappingConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/WrappingConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/XmlName.java b/xml/dom-openapi/src/com/intellij/util/xml/XmlName.java index 5c150215ab..3dcf355729 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/XmlName.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/XmlName.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/AbstractDomGenerateProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/AbstractDomGenerateProvider.java index 5b378d2fd9..780440e134 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/AbstractDomGenerateProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/AbstractDomGenerateProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.actions.generate; import com.intellij.openapi.editor.Editor; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DefaultGenerateElementProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DefaultGenerateElementProvider.java index cf9d47d665..26e52176b0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DefaultGenerateElementProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DefaultGenerateElementProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DomTemplateRunner.java similarity index 52% copy from xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java copy to xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DomTemplateRunner.java index 7c7c804436..a6016d577c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/actions/generate/DomTemplateRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,26 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.events; +package com.intellij.util.xml.actions.generate; -import com.intellij.util.xml.events.ElementChangedEvent; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.components.ServiceManager; import com.intellij.util.xml.DomElement; -import com.intellij.util.xml.DomEventVisitor; /** - * @author peter + * User: Sergey.Vasiliev */ -public class ElementUndefinedEvent extends ElementChangedEvent { +public abstract class DomTemplateRunner { - public ElementUndefinedEvent(final DomElement element) { - super(element); + public static DomTemplateRunner getInstance(Project project) { + return ServiceManager.getService(project, DomTemplateRunner.class); } + + public abstract void runTemplate(final T t, final String mappingId, final Editor editor); - public String toString() { - return "Undefined " + getElement(); - } - public void accept(DomEventVisitor visitor) { - visitor.visitElementUndefined(this); - } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java index 1317ee41c4..8f490a2d90 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListProcessor.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListProcessor.java index 9f9b6bc321..ba05968c6a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListProcessor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.converters; import org.jetbrains.annotations.NotNull; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/converters/PathReferenceConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/PathReferenceConverter.java index 09f33f13e8..c533e58e98 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/PathReferenceConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/PathReferenceConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/converters/QuotedValueConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/QuotedValueConverter.java index 781b8c327b..dac501ff75 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/QuotedValueConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/QuotedValueConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/converters/values/BooleanValueConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/BooleanValueConverter.java index 65a23b478d..cc52931551 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/values/BooleanValueConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/BooleanValueConverter.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.converters.values; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/converters/values/CharacterValueConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/CharacterValueConverter.java index 6a5554b954..d740a82c47 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/values/CharacterValueConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/CharacterValueConverter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.converters.values; import com.intellij.util.xml.ConvertContext; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/converters/values/NumberValueConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/NumberValueConverter.java index e8dab3b5bd..7445d9a155 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/values/NumberValueConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/values/NumberValueConverter.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.util.xml.converters.values; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/events/DomEvent.java b/xml/dom-openapi/src/com/intellij/util/xml/events/DomEvent.java index 54b7d87575..ab1a27d25f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/DomEvent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/events/DomEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/events/ElementChangedEvent.java b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementChangedEvent.java index 1978c4b44f..9cdd86c32b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementChangedEvent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementChangedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/events/ElementDefinedEvent.java b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementDefinedEvent.java index 2d6c83c119..e89a1f8e9f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementDefinedEvent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementDefinedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java index 7c7c804436..bedf358eb6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/events/ElementUndefinedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java index 16e4edcfdb..b7a4a74809 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java index a821618b44..6bc122441d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptor.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptor.java index da0680c999..add1f2e132 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCollectionProblemDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCustomAnnotationChecker.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCustomAnnotationChecker.java index 0e36c93754..9d0c38fe17 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCustomAnnotationChecker.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomCustomAnnotationChecker.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.util.xml.highlighting; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolder.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolder.java index 6c96a606f6..7f2017c76e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolder.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManager.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManager.java index f7f66a454b..77debde5f7 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptor.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptor.java index 539267b058..6c483af0f5 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptor.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptor.java index d38f3300e7..b67b1a64f4 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementResolveProblemDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsAnnotator.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsAnnotator.java index 06d174575c..3e7257a375 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsAnnotator.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsAnnotator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java index a7e891940f..d12b957460 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolder.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolder.java index e385729f86..70d3926a69 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolder.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsProblemsHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomHighlightingHelper.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomHighlightingHelper.java index 7505519443..4b2db8b162 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomHighlightingHelper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomHighlightingHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/RemoveDomElementQuickFix.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/RemoveDomElementQuickFix.java index ca9c862d4d..d24f7caf14 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/RemoveDomElementQuickFix.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/RemoveDomElementQuickFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/highlighting/ResolvingElementQuickFix.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/ResolvingElementQuickFix.java index f6e140de3e..85189c1ee3 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/ResolvingElementQuickFix.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/ResolvingElementQuickFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/DomModel.java b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModel.java index 60d3bc383a..87ed3d08b2 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/DomModel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java index 84539f6358..97dcd6cf20 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/MultipleDomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/MultipleDomModelFactory.java index 8b8d091ad6..ea34b32fc9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/MultipleDomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/MultipleDomModelFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.model; import com.intellij.openapi.util.UserDataHolder; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/model/SimpleModelFactory.java similarity index 65% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java copy to xml/dom-openapi/src/com/intellij/util/xml/model/SimpleModelFactory.java index 3450dfc540..f7b4a74883 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/SimpleModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,22 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.util.xml.model; -import com.intellij.util.xml.DomElement; import com.intellij.psi.xml.XmlFile; +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.DomFileElement; import org.jetbrains.annotations.Nullable; +import java.util.Set; + /** - * @author peter + * User: Sergey.Vasiliev */ -public abstract class EditedElementDescription { +public interface SimpleModelFactory> { + @Nullable - public XmlFile getEditedFile() { - return null; - } + M getModelByConfigFile(@Nullable XmlFile psiFile); + @Nullable - public abstract T find(); - public abstract void initialize(T element); - public abstract T addElement(); + DomFileElement createMergedModelRoot(Set configFiles); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java index 8a522c2f4b..96dffcc843 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/impl/BaseDomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/BaseDomModelFactory.java index 61e9beec94..fc948234d9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/BaseDomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/BaseDomModelFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.model.impl; import com.intellij.openapi.project.Project; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedDomModelFactory.java similarity index 58% copy from xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java copy to xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedDomModelFactory.java index 907b4d631c..0f1387a8de 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomFileElement.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedDomModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,35 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.util.xml.model.impl; -import com.intellij.openapi.util.ModificationTracker; import com.intellij.openapi.util.UserDataHolder; import com.intellij.psi.xml.XmlFile; -import com.intellij.psi.xml.XmlTag; +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.model.DomModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * @author peter + * User: Sergey.Vasiliev */ -public interface DomFileElement extends DomElement, UserDataHolder, ModificationTracker { +public interface CachedDomModelFactory , Scope extends UserDataHolder> { @NotNull - XmlFile getFile(); - - @NotNull - XmlFile getOriginalFile(); - - @Nullable - XmlTag getRootTag(); - - @NotNull - T getRootElement(); - - @NotNull - Class getRootElementClass(); - - @NotNull - DomFileDescription getFileDescription(); + Object[] computeDependencies(@Nullable M model, @Nullable Scope scope); + Scope getModelScope(@NotNull XmlFile xmlFile); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedMultipleDomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedMultipleDomModelFactory.java index 54692b5ede..fba3581a28 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedMultipleDomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedMultipleDomModelFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.model.impl; import com.intellij.openapi.project.Project; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedSimpleDomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedSimpleDomModelFactory.java index 65654f513e..ec4f9d4025 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedSimpleDomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/CachedSimpleDomModelFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.model.impl; import com.intellij.openapi.project.Project; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactory.java index 64ee844393..bda38ed134 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactoryHelper.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactoryHelper.java index 25f9e6bc87..7d4d3dddad 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactoryHelper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelFactoryHelper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.util.xml.model.impl; import com.intellij.util.xml.ModelMerger; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java index de3b9f5865..b50aa26da0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/model/impl/SimpleDomModelFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/SimpleDomModelFactory.java index cca55c3d7a..72d0e3a624 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/SimpleDomModelFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/SimpleDomModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/AbstractDomChildrenDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/AbstractDomChildrenDescription.java index 7fdd988855..bd528b52ed 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/AbstractDomChildrenDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/AbstractDomChildrenDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/CustomDomChildrenDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/CustomDomChildrenDescription.java index 1fc1ba625d..e594eb27ab 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/CustomDomChildrenDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/CustomDomChildrenDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomAttributeChildDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomAttributeChildDescription.java index eb1e828a90..80e60774e9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomAttributeChildDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomAttributeChildDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java index afb1446bfc..e86e69ca3f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomChildrenDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomCollectionChildDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomCollectionChildDescription.java index 5564ef8f64..b4385c51f4 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomCollectionChildDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomCollectionChildDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtender.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtender.java index 6ef69e5761..938f564c8c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtender.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtender.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtension.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtension.java index e3ed55ae30..b9324c3c21 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtension.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtensionsRegistrar.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtensionsRegistrar.java index 04605e518c..ecc3929d12 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtensionsRegistrar.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtensionsRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomFixedChildDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomFixedChildDescription.java index 4b0083f8b6..fcfde5c4a5 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomFixedChildDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomFixedChildDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomGenericInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomGenericInfo.java index 712a578bae..44e9c3a767 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomGenericInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/reflect/DomGenericInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/AbstractDomElementNode.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/AbstractDomElementNode.java index a9df06f662..f629d2ec66 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/AbstractDomElementNode.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/AbstractDomElementNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/BaseDomElementNode.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/BaseDomElementNode.java index 063d4d48cd..b24e352313 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/BaseDomElementNode.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/BaseDomElementNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/DomElementsGroupNode.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomElementsGroupNode.java index 7a7cb3acef..79c878b23c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/DomElementsGroupNode.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomElementsGroupNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/DomFileElementNode.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomFileElementNode.java index 8fcef7e70b..6ce17cd900 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/DomFileElementNode.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomFileElementNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeStructure.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeStructure.java index 073d582224..ceda5e16f4 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeStructure.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeStructure.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java index 5f6a81ccf6..4d1fc163cb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/tree/GenericValueNode.java b/xml/dom-openapi/src/com/intellij/util/xml/tree/GenericValueNode.java index 418cb9ef17..77b1611794 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/tree/GenericValueNode.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/tree/GenericValueNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractDomElementComponent.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractDomElementComponent.java index f0d2225a46..a01f73f592 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractDomElementComponent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractDomElementComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java index b03693a637..8598618b12 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseControl.java index 5cf66e1c64..d6dbc13ac6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseModifiableControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseModifiableControl.java index ce0a4d2b98..3d0c4f9425 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseModifiableControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BaseModifiableControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java index 1b553c931e..9bbc5a174b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BigStringComponent.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BigStringComponent.java index 8a4968257c..155d793433 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BigStringComponent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BigStringComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BigTextPanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BigTextPanel.java index 12df0c75be..10458cbace 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BigTextPanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BigTextPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanColumnInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanColumnInfo.java index 95eb0ab9ab..0b977a5c84 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanColumnInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanColumnInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanControl.java index 58f01b66b8..86f32c3a8b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanEnumControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanEnumControl.java index 4c25838435..c567fccfd1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanEnumControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BooleanEnumControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CaptionComponent.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CaptionComponent.java index 114c1f405b..4743fc9957 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CaptionComponent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CaptionComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/ChildGenericValueColumnInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ChildGenericValueColumnInfo.java index a9f3a9f1ef..dfaa714b1d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ChildGenericValueColumnInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ChildGenericValueColumnInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboControl.java index ebad7bee2c..63926ecb33 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboTableCellEditor.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboTableCellEditor.java index 1b7052e6a5..44ff7da6d5 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboTableCellEditor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ComboTableCellEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitAdapter.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitAdapter.java index 207d24ca2c..537fc1f114 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitAdapter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitListener.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitListener.java index 02d5db67e6..54c40b9ddb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitListener.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitablePanelUserActivityListener.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitablePanelUserActivityListener.java index 5bb379531d..82ca2b9435 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitablePanelUserActivityListener.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommitablePanelUserActivityListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/Committable.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/Committable.java index 94849255b5..8ba4190626 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/Committable.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/Committable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittablePanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittablePanel.java index 6723adae30..6eb4f889e0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittablePanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittablePanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java index ba09c6f935..8596298fdb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/CompositeCommittable.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/CompositeCommittable.java index 83a188055d..edb0749063 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CompositeCommittable.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/CompositeCommittable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java index ba09e4faa1..b0861df952 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionWrapper.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionWrapper.java index d35e119397..b2c25d91d8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionWrapper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomColumnInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomColumnInfo.java index 29dcb99af9..044bb44a65 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomColumnInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomColumnInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomEditorManager.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomEditorManager.java index 1e4f8750ef..420a138b17 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomEditorManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomEditorManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFileEditor.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFileEditor.java index 230cbd46a2..4c82a84b16 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFileEditor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFileEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFixedWrapper.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFixedWrapper.java index 31fca55e0a..7597791f26 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFixedWrapper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomFixedWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomStringWrapper.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomStringWrapper.java index 9277f8252b..b2e9c2958c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomStringWrapper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomStringWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomTableView.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomTableView.java index 63786c75e2..f25fbfc798 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomTableView.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomTableView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIControl.java index 47d2d1eada..db205a6879 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIControl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIFactory.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIFactory.java index 59e9b743c5..941fc00169 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIFactory.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java index 07af6bcf16..7aa1e5f54f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/DomWrapper.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomWrapper.java index da40da7431..8dc12317a2 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomWrapper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java index 3450dfc540..e87814ed94 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/EditorContainerPanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/EditorContainerPanel.java index 40e4b73d60..59be29843d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditorContainerPanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/EditorContainerPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/EmptyPane.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/EmptyPane.java index ca59318a41..657ac638d9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EmptyPane.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/EmptyPane.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java index 7da68181c2..7c6806e39d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/GenericValueColumnInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/GenericValueColumnInfo.java index 14650db3f1..033e609567 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/GenericValueColumnInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/GenericValueColumnInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/Highlightable.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/Highlightable.java index b6cf857afd..815a13e864 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/Highlightable.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/Highlightable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/MockDomElementsEditor.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/MockDomElementsEditor.java index 270363991b..0821f3b4c3 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MockDomElementsEditor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/MockDomElementsEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java index c5d320d77d..f84aee2a8b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditor.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditor.java index ea879bb9d4..affedaf7e6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditor.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditorProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditorProvider.java index 2394544a63..882f213035 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditorProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiClassPanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiClassPanel.java index cec612491f..c864c7c41a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiClassPanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiClassPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiTypePanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiTypePanel.java index edc569424e..86631180f6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiTypePanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/PsiTypePanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java index 5533e7df8e..edb3f41fa1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/StripeTableCellRenderer.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/StripeTableCellRenderer.java index dc486df70e..98537191cb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/StripeTableCellRenderer.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/StripeTableCellRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/TextPanel.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/TextPanel.java index b51a7d8eac..d6bed9d963 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/TextPanel.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/TextPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java index 28876eb7b1..d778454227 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/UndoHelper.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/UndoHelper.java index 3330a052fd..8af5568b74 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/UndoHelper.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/UndoHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/Warning.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/Warning.java index a17d74bfe2..e59ddee36d 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/Warning.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/Warning.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java index 4e153c6648..475920aa06 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/DefaultAddAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/DefaultAddAction.java index b79f21b17b..a564e03150 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/DefaultAddAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/DefaultAddAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java index 9fcb7edcb5..372bf84cc7 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementProvider.java index 2b990e249e..810a778ab2 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java index c506a4cec0..b9a1e96c95 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.application.options; diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.java b/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.java index c3396072d2..dc4d9f9b40 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.java +++ b/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.application.options; diff --git a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java index f615e27634..c5b94502fd 100644 --- a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java +++ b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.openapi.options.Configurable; diff --git a/xml/impl/src/com/intellij/application/options/TagListDialog.java b/xml/impl/src/com/intellij/application/options/TagListDialog.java index 8ccd15784e..6b279ba935 100644 --- a/xml/impl/src/com/intellij/application/options/TagListDialog.java +++ b/xml/impl/src/com/intellij/application/options/TagListDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.openapi.actionSystem.*; diff --git a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java index 8626abef7e..23e708377e 100644 --- a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.application.options.editor.AutoImportOptionsProvider; diff --git a/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java index 20aba7f769..08ffc6265e 100644 --- a/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; diff --git a/xml/impl/src/com/intellij/application/options/XmlIndentOptionsProvider.java b/xml/impl/src/com/intellij/application/options/XmlIndentOptionsProvider.java index ae9f12a65b..ffca3447cc 100644 --- a/xml/impl/src/com/intellij/application/options/XmlIndentOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlIndentOptionsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.openapi.fileTypes.FileType; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java b/xml/impl/src/com/intellij/application/options/XmlOptionsApplicabilityFilter.java similarity index 65% copy from xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java copy to xml/impl/src/com/intellij/application/options/XmlOptionsApplicabilityFilter.java index 79b45fea3a..52b0e9428b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlOptionsApplicabilityFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.application.options; /** - * @author peter + * @author yole */ -public class ParentScopeProvider extends ScopeProvider{ - public DomElement getScope(DomElement element) { - return element.getParent(); +public class XmlOptionsApplicabilityFilter extends OptionsApplicabilityFilter { + public boolean isOptionApplicable(final OptionId optionId) { + return optionId == OptionId.COMPLETION_AUTO_POPUP_XML; } } diff --git a/xml/impl/src/com/intellij/application/options/XmlSettings.java b/xml/impl/src/com/intellij/application/options/XmlSettings.java index 3608bc902d..cf71cff0b2 100644 --- a/xml/impl/src/com/intellij/application/options/XmlSettings.java +++ b/xml/impl/src/com/intellij/application/options/XmlSettings.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options; import com.intellij.openapi.application.PathManager; diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java index 496cd0b3f6..2a03cd2461 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options.editor; import com.intellij.openapi.options.BeanConfigurable; diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java index edbb97be41..cd18ce3cc9 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options.editor; import com.intellij.openapi.application.PathManager; diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java index 6d77b34ec6..722928855a 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.application.options.editor; import com.intellij.openapi.options.ConfigurationException; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java b/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java similarity index 51% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java copy to xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java index ba09c6f935..40b6374241 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java +++ b/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,26 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; -import org.jetbrains.annotations.Nullable; - -/** - * @author peter +/* + * User: anna + * Date: 14-Feb-2008 */ -public class CommittableUtil { +package com.intellij.application.options.editor; - public void commit(Committable committable) { - committable.commit(); - } - - public void queueReset(Committable committable) { - committable.reset(); - } +import com.intellij.openapi.application.ApplicationBundle; +import com.intellij.openapi.options.BeanConfigurable; - public static void updateHighlighting(@Nullable Committable committable) { - if (committable instanceof Highlightable) { - ((Highlightable)committable).updateHighlighting(); - } +public class XmlCodeFoldingOptionsProvider extends BeanConfigurable implements CodeFoldingOptionsProvider { + public XmlCodeFoldingOptionsProvider() { + super(XmlFoldingSettings.getInstance()); + checkBox("COLLAPSE_XML_TAGS", ApplicationBundle.message("checkbox.collapse.xml.tags")); } -} +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java b/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java index b63fc240ef..386d4eb372 100644 --- a/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java +++ b/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java index a0d02c1ab2..8f75e5a231 100644 --- a/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java +++ b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.actions; import com.intellij.codeInsight.CodeInsightActionHandler; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionData.java b/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionData.java index 12ff3897d8..c78cbfc6dc 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionData.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionData.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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. */ /* diff --git a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java index 5005251880..65b560a451 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java index 7fe76788b8..df13deb1aa 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.lang.Language; diff --git a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java b/xml/impl/src/com/intellij/codeInsight/completion/XHtmlCompletionData.java similarity index 69% copy from xml/openapi/src/com/intellij/psi/html/HtmlTag.java copy to xml/impl/src/com/intellij/codeInsight/completion/XHtmlCompletionData.java index 279f3433bc..6035c3baf8 100644 --- a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XHtmlCompletionData.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.html; - -import com.intellij.psi.xml.XmlTag; +package com.intellij.codeInsight.completion; /** * Created by IntelliJ IDEA. * User: maxim - * Date: 03.11.2004 - * Time: 11:16:25 + * Date: 28.11.2004 + * Time: 0:23:35 * To change this template use File | Settings | File Templates. */ -public interface HtmlTag extends XmlTag { +public class XHtmlCompletionData extends HtmlCompletionData { + public XHtmlCompletionData() { + super(false); + } + + protected boolean isCaseInsensitive() { + return false; + } } diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java index 201de68a8f..1b7edc78ff 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.codeInsight.completion; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAutoLookupHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAutoLookupHandler.java index 2966671e22..8b4a7932f8 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAutoLookupHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAutoLookupHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCharFilter.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCharFilter.java index 8d23f95ad2..9d5c7f7852 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCharFilter.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCharFilter.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Jul 23, 2002 diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java index 068eb71196..53fe5b0c36 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.codeInsight.lookup.InsertHandlerDecorator; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java index 1adeed0095..58eb6cd8ec 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.codeInsight.TailType; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java index 4b500f6871..584a1eae2d 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java index b5880387b9..59fd8b5197 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.completion; import com.intellij.application.options.editor.WebEditorOptions; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java b/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java index 1d2913c339..dab60a7a6a 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2005 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInsight.daemon; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java index 7b051fdd82..b2d986e612 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.application.options.XmlSettings; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java index 1293ccf31a..e13b7bdda9 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.hint.QuestionAction; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/InsertRequiredAttributeFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/InsertRequiredAttributeFix.java index 2479470375..356467eb27 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/InsertRequiredAttributeFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/InsertRequiredAttributeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java index 4e21a1144c..84062fe5a7 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java index f42ec009f3..9372cb3ab0 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.psi.PsiErrorElement; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java index 8cf6bd1d14..c347c0f4fe 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.daemon.*; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java index 846689ad12..2a753b9e42 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.analysis.AnalysisScope; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java index d334332a24..1bb8183b07 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.ui.ColoredListCellRenderer; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java index 4381fba99e..6f7aa860e4 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis; import com.intellij.codeHighlighting.HighlightDisplayLevel; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java index f6492c3f98..d2b85de211 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis.encoding; import com.intellij.codeInsight.completion.simple.SimpleLookupItem; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java index a7111e1cf5..ffe0b628ae 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.analysis.encoding; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddXsiSchemaLocationForExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddXsiSchemaLocationForExtResourceAction.java index 22eb814759..179cd42b53 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddXsiSchemaLocationForExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddXsiSchemaLocationForExtResourceAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.CodeInsightUtilBase; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BaseExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BaseExtResourceAction.java index 33421fea66..e695f9f07c 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BaseExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BaseExtResourceAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java index 04ad4e2a7e..a1f62db3cf 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.quickfix; import com.intellij.javaee.ExternalResourceManagerImpl; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/IgnoreExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/IgnoreExtResourceAction.java index f254c799e9..2a1c2299d9 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/IgnoreExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/IgnoreExtResourceAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.quickfix; import com.intellij.javaee.ExternalResourceManagerEx; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java index 5abe1f7282..1b78b93474 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.daemon.impl.quickfix; import com.intellij.javaee.ExternalResourceConfigurable; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java index 45712abf69..9f884a8798 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java index 5d21b5d847..6cff1ee19a 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.xml.XmlFile; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlQuoteHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlQuoteHandler.java index 89554ec678..87f92e70a4 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlQuoteHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlQuoteHandler.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInsight.editorActions; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java index f737b3023d..f9871a6aac 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Jul 18, 2002 diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java index ca07035a16..c2f4f89184 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.codeInsight.AutoPopupController; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlBasicWordSelectionFilter.java similarity index 58% copy from xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java copy to xml/impl/src/com/intellij/codeInsight/editorActions/XmlBasicWordSelectionFilter.java index 01b79aa8e7..d17ddc0500 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlBasicWordSelectionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.codeInsight.editorActions; -package com.intellij.psi.xml; - +import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; +import com.intellij.psi.xml.XmlToken; +import com.intellij.psi.xml.XmlElement; /** - * Created by IntelliJ IDEA. - * User: maxim.mossienko - * Date: Jan 13, 2006 - * Time: 6:56:44 PM - * To change this template use File | Settings | File Templates. + * @author yole */ -public interface XmlConditionalSection extends XmlElement { - boolean isIncluded(PsiFile target); - PsiElement getBodyStart(); +public class XmlBasicWordSelectionFilter implements Condition { + public boolean value(final PsiElement e) { + return !(e instanceof XmlToken) && + !(e instanceof XmlElement); + } } diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java index 340a6e658b..fe440e00a0 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java index c911bbfc61..fd0b9c6e77 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.lang.ASTNode; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlElementSelectioner.java similarity index 67% copy from xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java copy to xml/impl/src/com/intellij/codeInsight/editorActions/XmlElementSelectioner.java index c23a4eaab4..a0b512148e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericAttributeValue.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlElementSelectioner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.codeInsight.editorActions; +import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; -import org.jetbrains.annotations.Nullable; -/** - * @author peter - */ -public interface GenericAttributeValue extends GenericDomValue{ - @Nullable - XmlAttribute getXmlAttribute(); - - @Nullable - XmlAttributeValue getXmlAttributeValue(); -} +class XmlElementSelectioner extends ExtendWordSelectionHandlerBase { + public boolean canSelect(PsiElement e) { + return e instanceof XmlAttribute || e instanceof XmlAttributeValue; + } +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java index 758c928367..443100f5b0 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.application.options.editor.WebEditorOptions; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlLineSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlLineSelectioner.java index b1d62ccd65..76a25de71c 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlLineSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlLineSelectioner.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlQuoteHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlQuoteHandler.java index 5e561fab1f..1f87de23ce 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlQuoteHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlQuoteHandler.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInsight.editorActions; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java index 12a4e9ad2f..8794fe0d05 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java index 442b09267f..cc05ceae07 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTokenSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTokenSelectioner.java index 21e3ce11a2..c7e4b515aa 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTokenSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTokenSelectioner.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java index fecc7cda11..bca3660aa4 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.editorActions.moveUpDown; import com.intellij.openapi.editor.Document; diff --git a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java index e0e744fc8a..87f12b27ed 100644 --- a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.folding.impl; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/codeInsight/generation/surroundWith/TemplateSurrounder.java b/xml/impl/src/com/intellij/codeInsight/generation/surroundWith/TemplateSurrounder.java index 0ae6069d18..da26325f3e 100644 --- a/xml/impl/src/com/intellij/codeInsight/generation/surroundWith/TemplateSurrounder.java +++ b/xml/impl/src/com/intellij/codeInsight/generation/surroundWith/TemplateSurrounder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.generation.surroundWith; import com.intellij.codeInsight.template.TemplateContextType; diff --git a/xml/impl/src/com/intellij/codeInsight/highlighting/HtmlClosingTagErrorFilter.java b/xml/impl/src/com/intellij/codeInsight/highlighting/HtmlClosingTagErrorFilter.java index 7f299c1513..159105fd9d 100644 --- a/xml/impl/src/com/intellij/codeInsight/highlighting/HtmlClosingTagErrorFilter.java +++ b/xml/impl/src/com/intellij/codeInsight/highlighting/HtmlClosingTagErrorFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.highlighting; import com.intellij.lang.html.HTMLLanguage; diff --git a/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java b/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java index 06a0ab2862..aff0c382da 100644 --- a/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java +++ b/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.highlighting; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java index a139261685..34fe453241 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.hint; import org.jetbrains.annotations.NotNull; diff --git a/xml/impl/src/com/intellij/codeInsight/hint/XmlImplementationTextSelectioner.java b/xml/impl/src/com/intellij/codeInsight/hint/XmlImplementationTextSelectioner.java index c04670f30d..977a0dd6b8 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/XmlImplementationTextSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/XmlImplementationTextSelectioner.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * User: anna * Date: 01-Feb-2008 */ diff --git a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java index 5752a0d980..f5cb164cc0 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.hint.api.impls; import com.intellij.codeInsight.CodeInsightBundle; diff --git a/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java b/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java index 3c189ff73f..d7eb4a73a1 100644 --- a/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.navigation; import com.intellij.psi.PsiFile; diff --git a/xml/impl/src/com/intellij/codeInsight/template/HtmlContextType.java b/xml/impl/src/com/intellij/codeInsight/template/HtmlContextType.java index e64a5b664d..6ee05bf2f2 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/HtmlContextType.java +++ b/xml/impl/src/com/intellij/codeInsight/template/HtmlContextType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInsight.template; import com.intellij.codeInsight.CodeInsightBundle; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java b/xml/impl/src/com/intellij/codeInsight/template/XmlContextType.java similarity index 59% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java copy to xml/impl/src/com/intellij/codeInsight/template/XmlContextType.java index 5533e7df8e..fc20af0047 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java +++ b/xml/impl/src/com/intellij/codeInsight/template/XmlContextType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.codeInsight.template; -import com.intellij.util.xml.DomElement; +import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.openapi.fileTypes.StdFileTypes; /** - * @author peter + * @author yole */ -public class StringColumnInfo extends DomColumnInfo { - public StringColumnInfo(final String name) { - super(name); +public class XmlContextType extends FileTypeBasedContextType { + public XmlContextType() { + super("XML", CodeInsightBundle.message("dialog.edit.template.checkbox.xml"), StdFileTypes.XML); } - public String valueOf(final T object) { - return object.getPresentation().getTypeName(); - } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java b/xml/impl/src/com/intellij/codeInsight/template/XmlDefaultLiveTemplatesProvider.java similarity index 61% copy from xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java copy to xml/impl/src/com/intellij/codeInsight/template/XmlDefaultLiveTemplatesProvider.java index 9d144e8126..ddd130748c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/template/XmlDefaultLiveTemplatesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.codeInsight.template; -import org.jetbrains.annotations.NotNull; +import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; /** - * @author peter + * @author yole */ -public class RootScopeProvider extends ScopeProvider{ - - public DomElement getScope(@NotNull DomElement element) { - return DomUtil.getRoot(element); +public class XmlDefaultLiveTemplatesProvider implements DefaultLiveTemplatesProvider { + public String[] getDefaultLiveTemplateFiles() { + return new String[] { "/liveTemplates/html_xml" }; } } diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddCustomTagOrAttributeIntentionAction.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddCustomTagOrAttributeIntentionAction.java index 7a3ef08bf3..9f897214cc 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddCustomTagOrAttributeIntentionAction.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddCustomTagOrAttributeIntentionAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java index e82c240778..81e2b1f441 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlExtraClosingTagInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlExtraClosingTagInspection.java index 186c40356e..923866ef70 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlExtraClosingTagInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlExtraClosingTagInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java index 935f21f33b..aadd816475 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java index 288377c870..ad654d1238 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java index 787d692134..d14b4f1097 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveAttributeIntentionAction.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveAttributeIntentionAction.java index 453c9db3f1..33793cbf92 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveAttributeIntentionAction.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveAttributeIntentionAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java index 844a14c9e1..0610645295 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RenameTagBeginOrEndIntentionAction.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RenameTagBeginOrEndIntentionAction.java index 4728066fdb..897a6a2edf 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RenameTagBeginOrEndIntentionAction.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RenameTagBeginOrEndIntentionAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java index df0851e4bb..e110a89857 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java index d44824435d..da64b9569d 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.codeInspection.htmlInspections; import com.intellij.codeInspection.InspectionToolProvider; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java index 6401e1ae88..25eb69757b 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java index 4b9645df2d..35bcc7ed6d 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.codeInspection.htmlInspections; diff --git a/xml/impl/src/com/intellij/featureStatistics/XmlProductivityFeatureProvider.java b/xml/impl/src/com/intellij/featureStatistics/XmlProductivityFeatureProvider.java index f63844e927..78d44790d0 100644 --- a/xml/impl/src/com/intellij/featureStatistics/XmlProductivityFeatureProvider.java +++ b/xml/impl/src/com/intellij/featureStatistics/XmlProductivityFeatureProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.featureStatistics; import com.intellij.codeInsight.completion.XmlCompletionContributor; diff --git a/xml/impl/src/com/intellij/html/HtmlLineMarkerProvider.java b/xml/impl/src/com/intellij/html/HtmlLineMarkerProvider.java index 7b9424847f..dafaabb126 100644 --- a/xml/impl/src/com/intellij/html/HtmlLineMarkerProvider.java +++ b/xml/impl/src/com/intellij/html/HtmlLineMarkerProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.html; import com.intellij.codeInsight.daemon.LineMarkerInfo; diff --git a/xml/impl/src/com/intellij/html/HtmlLinkTagIndex.java b/xml/impl/src/com/intellij/html/HtmlLinkTagIndex.java index 7eedd693ed..e32fa4e6bf 100644 --- a/xml/impl/src/com/intellij/html/HtmlLinkTagIndex.java +++ b/xml/impl/src/com/intellij/html/HtmlLinkTagIndex.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.html; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaElementDescriptor.java b/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaElementDescriptor.java index dad7ba4e7f..c4e70f412b 100644 --- a/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaElementDescriptor.java +++ b/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaElementDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.html.impl; import com.intellij.openapi.extensions.Extensions; diff --git a/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaNSDescriptor.java b/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaNSDescriptor.java index 802475e34c..2638f914fe 100644 --- a/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaNSDescriptor.java +++ b/xml/impl/src/com/intellij/html/impl/RelaxedHtmlFromSchemaNSDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.html.impl; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/ide/actions/CreateHtmlAction.java b/xml/impl/src/com/intellij/ide/actions/CreateHtmlAction.java index e10b9e7591..59cb3e07f9 100644 --- a/xml/impl/src/com/intellij/ide/actions/CreateHtmlAction.java +++ b/xml/impl/src/com/intellij/ide/actions/CreateHtmlAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.ide.actions; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java b/xml/impl/src/com/intellij/ide/actions/CreateXhtmlAction.java similarity index 60% copy from xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java copy to xml/impl/src/com/intellij/ide/actions/CreateXhtmlAction.java index 9d144e8126..7f4c01198f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java +++ b/xml/impl/src/com/intellij/ide/actions/CreateXhtmlAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; -import org.jetbrains.annotations.NotNull; +package com.intellij.ide.actions; + +import com.intellij.ide.fileTemplates.FileTemplateManager; +import com.intellij.openapi.fileTypes.StdFileTypes; /** - * @author peter + * @author spleaner */ -public class RootScopeProvider extends ScopeProvider{ +public class CreateXhtmlAction extends CreateHtmlAction { - public DomElement getScope(@NotNull DomElement element) { - return DomUtil.getRoot(element); + public CreateXhtmlAction() { + super(StdFileTypes.XHTML, FileTemplateManager.INTERNAL_XHTML_TEMPLATE_NAME); } } diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserSettingsProviderImpl.java b/xml/impl/src/com/intellij/ide/browsers/BrowserSettingsProviderImpl.java index 7ceacda996..c583f89b54 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowserSettingsProviderImpl.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowserSettingsProviderImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.ide.BrowserSettingsProvider; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java b/xml/impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java similarity index 59% copy from xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java copy to xml/impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java index 9d144e8126..2af780a1e1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.ide.browsers; +import com.intellij.openapi.options.Configurable; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.NonNls; /** - * @author peter + * @author nik */ -public class RootScopeProvider extends ScopeProvider{ +public abstract class BrowserSpecificSettings { - public DomElement getScope(@NotNull DomElement element) { - return DomUtil.getRoot(element); + public abstract Configurable createConfigurable(); + + @NotNull @NonNls + public String[] getAdditionalParameters() { + return ArrayUtil.EMPTY_STRING_ARRAY; } } diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java index 15c3a3b38e..5aab88c628 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.ide.BrowserUtil; diff --git a/xml/impl/src/com/intellij/ide/browsers/HtmlWebBrowserUrlProvider.java b/xml/impl/src/com/intellij/ide/browsers/HtmlWebBrowserUrlProvider.java index bd511a8126..e958b32ba5 100644 --- a/xml/impl/src/com/intellij/ide/browsers/HtmlWebBrowserUrlProvider.java +++ b/xml/impl/src/com/intellij/ide/browsers/HtmlWebBrowserUrlProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/ide/browsers/WebBrowserSettings.java b/xml/impl/src/com/intellij/ide/browsers/WebBrowserSettings.java index 2625d8041f..e7b391d767 100644 --- a/xml/impl/src/com/intellij/ide/browsers/WebBrowserSettings.java +++ b/xml/impl/src/com/intellij/ide/browsers/WebBrowserSettings.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import org.jetbrains.annotations.Nullable; diff --git a/xml/impl/src/com/intellij/ide/browsers/WebBrowsersPanel.java b/xml/impl/src/com/intellij/ide/browsers/WebBrowsersPanel.java index 0a26617934..55608f5c4b 100644 --- a/xml/impl/src/com/intellij/ide/browsers/WebBrowsersPanel.java +++ b/xml/impl/src/com/intellij/ide/browsers/WebBrowsersPanel.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.ide.IdeBundle; diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java index 3848417507..133ee83cd9 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java +++ b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers.firefox; import java.io.File; diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java index ddf87de85b..ef8b3aee6c 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java +++ b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers.firefox; import com.intellij.ide.browsers.BrowserSpecificSettings; diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java index 958774857a..4fe14efb30 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java +++ b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers.firefox; import com.intellij.openapi.fileChooser.FileChooserDescriptor; diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java index 1fedf12c85..d5a36c47c7 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java +++ b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers.firefox; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java b/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java dissimilarity index 66% index ceab70a9e0..eddb785259 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java @@ -1,67 +1,51 @@ -/* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * - */ -package com.intellij.ide.highlighter; - -import com.intellij.ide.IdeBundle; -import com.intellij.lang.dtd.DTDLanguage; -import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; -import org.jetbrains.annotations.NotNull; - -import javax.swing.*; - -public class DTDFileType extends LanguageFileType { - private static final Icon ICON = IconLoader.getIcon("/fileTypes/dtd.png"); - - public DTDFileType() { - super(DTDLanguage.INSTANCE); - } - - @NotNull - public String getName() { - return "DTD"; - } - - @NotNull - public String getDescription() { - return IdeBundle.message("filetype.description.dtd"); - } - - @NotNull - public String getDefaultExtension() { - return "dtd"; - } - - public Icon getIcon() { - return ICON; - } -} \ No newline at end of file +/* + * Copyright 2000-2009 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.ide.highlighter; + +import com.intellij.ide.IdeBundle; +import com.intellij.lang.dtd.DTDLanguage; +import com.intellij.openapi.fileTypes.LanguageFileType; +import com.intellij.openapi.util.IconLoader; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +public class DTDFileType extends LanguageFileType { + private static final Icon ICON = IconLoader.getIcon("/fileTypes/dtd.png"); + + public DTDFileType() { + super(DTDLanguage.INSTANCE); + } + + @NotNull + public String getName() { + return "DTD"; + } + + @NotNull + public String getDescription() { + return IdeBundle.message("filetype.description.dtd"); + } + + @NotNull + public String getDefaultExtension() { + return "dtd"; + } + + public Icon getIcon() { + return ICON; + } +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java index 330ec39728..9bba8f89da 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java +++ b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.highlighter; diff --git a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java index debc2afccb..89b93e95da 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.highlighter; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java b/xml/impl/src/com/intellij/ide/highlighter/HtmlHighlighterFactory.java similarity index 51% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java copy to xml/impl/src/com/intellij/ide/highlighter/HtmlHighlighterFactory.java index ba09c6f935..67a361629b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/CommittableUtil.java +++ b/xml/impl/src/com/intellij/ide/highlighter/HtmlHighlighterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,26 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; -import org.jetbrains.annotations.Nullable; - -/** - * @author peter +/* + * @author max */ -public class CommittableUtil { +package com.intellij.ide.highlighter; - public void commit(Committable committable) { - committable.commit(); - } - - public void queueReset(Committable committable) { - committable.reset(); - } +import com.intellij.openapi.editor.colors.EditorColorsScheme; +import com.intellij.openapi.editor.highlighter.EditorHighlighter; +import com.intellij.openapi.fileTypes.SyntaxHighlighter; - public static void updateHighlighting(@Nullable Committable committable) { - if (committable instanceof Highlightable) { - ((Highlightable)committable).updateHighlighting(); - } +public class HtmlHighlighterFactory { + public static EditorHighlighter createHTMLHighlighter(EditorColorsScheme settings){ + SyntaxHighlighter highlighter = new HtmlFileHighlighter(); + return HighlighterFactory.createHighlighter(highlighter, settings); } -} +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java dissimilarity index 66% index 802f8e9b9b..3d96410ec2 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java @@ -1,67 +1,51 @@ -/* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * - */ -package com.intellij.ide.highlighter; - -import com.intellij.ide.IdeBundle; -import com.intellij.lang.xhtml.XHTMLLanguage; -import com.intellij.openapi.util.IconLoader; -import org.jetbrains.annotations.NotNull; - -import javax.swing.*; - -public class XHtmlFileType extends HtmlFileType { - private static final Icon ICON = IconLoader.getIcon("/fileTypes/xhtml.png"); - public static final XHtmlFileType INSTANCE = new XHtmlFileType(); - - private XHtmlFileType() { - super(XHTMLLanguage.INSTANCE); - } - - @NotNull - public String getName() { - return "XHTML"; - } - - @NotNull - public String getDescription() { - return IdeBundle.message("filetype.description.xhtml"); - } - - @NotNull - public String getDefaultExtension() { - return "xhtml"; - } - - public Icon getIcon() { - return ICON; - } -} \ No newline at end of file +/* + * Copyright 2000-2009 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.ide.highlighter; + +import com.intellij.ide.IdeBundle; +import com.intellij.lang.xhtml.XHTMLLanguage; +import com.intellij.openapi.util.IconLoader; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +public class XHtmlFileType extends HtmlFileType { + private static final Icon ICON = IconLoader.getIcon("/fileTypes/xhtml.png"); + public static final XHtmlFileType INSTANCE = new XHtmlFileType(); + + private XHtmlFileType() { + super(XHTMLLanguage.INSTANCE); + } + + @NotNull + public String getName() { + return "XHTML"; + } + + @NotNull + public String getDescription() { + return IdeBundle.message("filetype.description.xhtml"); + } + + @NotNull + public String getDefaultExtension() { + return "xhtml"; + } + + public Icon getIcon() { + return ICON; + } +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java b/xml/impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java index 3f8e752883..9ee712fdf4 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.highlighter; diff --git a/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java index f1985b501d..5b90121be6 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.highlighter; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/ide/highlighter/XmlHighlighterFactory.java similarity index 56% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/ide/highlighter/XmlHighlighterFactory.java index c5d320d77d..5e9faf45c1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XmlHighlighterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; -/** - * @author peter +/* + * @author max */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; +package com.intellij.ide.highlighter; - public final int getRowCount() { - return myRowCount; - } +import com.intellij.openapi.editor.colors.EditorColorsScheme; +import com.intellij.openapi.editor.highlighter.EditorHighlighter; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class XmlHighlighterFactory { + public static EditorHighlighter createXMLHighlighter(EditorColorsScheme settings){ + return HighlighterFactory.createHighlighter(new XmlFileHighlighter(), settings); } -} +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java b/xml/impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java index c1fa28f124..5ac48880cf 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.highlighter; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/ide/structureView/impl/xml/AbstractXmlTagTreeElement.java b/xml/impl/src/com/intellij/ide/structureView/impl/xml/AbstractXmlTagTreeElement.java index 1225d95750..fde4906047 100644 --- a/xml/impl/src/com/intellij/ide/structureView/impl/xml/AbstractXmlTagTreeElement.java +++ b/xml/impl/src/com/intellij/ide/structureView/impl/xml/AbstractXmlTagTreeElement.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.structureView.impl.xml; import com.intellij.ide.structureView.StructureViewTreeElement; diff --git a/xml/impl/src/com/intellij/ide/structureView/impl/xml/DtdFileTreeElement.java b/xml/impl/src/com/intellij/ide/structureView/impl/xml/DtdFileTreeElement.java index a1ad5dcb3a..2da84f2ae5 100644 --- a/xml/impl/src/com/intellij/ide/structureView/impl/xml/DtdFileTreeElement.java +++ b/xml/impl/src/com/intellij/ide/structureView/impl/xml/DtdFileTreeElement.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.structureView.impl.xml; diff --git a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlFileTreeElement.java b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlFileTreeElement.java index d2325bb789..e1cd6a2134 100644 --- a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlFileTreeElement.java +++ b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlFileTreeElement.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.structureView.impl.xml; diff --git a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlStructureViewTreeModel.java b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlStructureViewTreeModel.java index bba53264ed..6a36a5809f 100644 --- a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlStructureViewTreeModel.java +++ b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlStructureViewTreeModel.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.structureView.impl.xml; diff --git a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java index 228ca1cbf3..b14f957f07 100644 --- a/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java +++ b/xml/impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.ide.structureView.impl.xml; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java b/xml/impl/src/com/intellij/ide/util/treeView/XmlDoctypeNodeDescriptor.java similarity index 58% copy from xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java copy to xml/impl/src/com/intellij/ide/util/treeView/XmlDoctypeNodeDescriptor.java index 01b79aa8e7..ea771e31e5 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java +++ b/xml/impl/src/com/intellij/ide/util/treeView/XmlDoctypeNodeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,20 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.ide.util.treeView; -package com.intellij.psi.xml; - +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; /** - * Created by IntelliJ IDEA. - * User: maxim.mossienko - * Date: Jan 13, 2006 - * Time: 6:56:44 PM - * To change this template use File | Settings | File Templates. + * @author Mike */ -public interface XmlConditionalSection extends XmlElement { - boolean isIncluded(PsiFile target); - PsiElement getBodyStart(); +public class XmlDoctypeNodeDescriptor extends SmartElementDescriptor { + public XmlDoctypeNodeDescriptor(Project project, NodeDescriptor parentDescriptor, PsiElement element) { + super(project, parentDescriptor, element); + //noinspection HardCodedStringLiteral + myName = "DOCTYPE"; + } } diff --git a/xml/impl/src/com/intellij/javaee/EditLocationDialog.java b/xml/impl/src/com/intellij/javaee/EditLocationDialog.java index d9868cde2e..18150a7bca 100644 --- a/xml/impl/src/com/intellij/javaee/EditLocationDialog.java +++ b/xml/impl/src/com/intellij/javaee/EditLocationDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.openapi.fileChooser.FileChooser; diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java index d5da7f0e30..386f4308f7 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.openapi.options.BaseConfigurable; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java b/xml/impl/src/com/intellij/javaee/ExternalResourceListener.java similarity index 77% copy from xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java copy to xml/impl/src/com/intellij/javaee/ExternalResourceListener.java index adb16b3bea..0bca97c439 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; - - +package com.intellij.javaee; /** * @author mike */ -public interface XmlEnumeratedType extends XmlElement { - XmlElement[] getEnumeratedValues(); +public interface ExternalResourceListener { + void externalResourceChanged(); } diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerEx.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerEx.java index 03f6a8e8f9..a9ecd06711 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerEx.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerEx.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.openapi.project.Project; diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java index 86ff2abc66..04be2309fe 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.application.options.PathMacrosImpl; diff --git a/xml/impl/src/com/intellij/javaee/ImplicitNamespaceDescriptorProvider.java b/xml/impl/src/com/intellij/javaee/ImplicitNamespaceDescriptorProvider.java index eebc74486f..d99fad7f75 100644 --- a/xml/impl/src/com/intellij/javaee/ImplicitNamespaceDescriptorProvider.java +++ b/xml/impl/src/com/intellij/javaee/ImplicitNamespaceDescriptorProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.openapi.extensions.ExtensionPointName; diff --git a/xml/impl/src/com/intellij/javaee/InternalResourceProvider.java b/xml/impl/src/com/intellij/javaee/InternalResourceProvider.java index d769bd5ede..c52f535a49 100644 --- a/xml/impl/src/com/intellij/javaee/InternalResourceProvider.java +++ b/xml/impl/src/com/intellij/javaee/InternalResourceProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.xml.util.XmlUtil; diff --git a/xml/impl/src/com/intellij/javaee/ProjectResources.java b/xml/impl/src/com/intellij/javaee/ProjectResources.java index 072ab20667..f63cc54147 100644 --- a/xml/impl/src/com/intellij/javaee/ProjectResources.java +++ b/xml/impl/src/com/intellij/javaee/ProjectResources.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.application.options.PathMacrosImpl; diff --git a/xml/impl/src/com/intellij/javaee/PsiExternalResourceNotifier.java b/xml/impl/src/com/intellij/javaee/PsiExternalResourceNotifier.java index 7f51dbdb36..f6b6efb9cc 100644 --- a/xml/impl/src/com/intellij/javaee/PsiExternalResourceNotifier.java +++ b/xml/impl/src/com/intellij/javaee/PsiExternalResourceNotifier.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.javaee; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; diff --git a/xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java b/xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java index 1d85fe7c10..d32f87b032 100644 --- a/xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java +++ b/xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java @@ -1,17 +1,17 @@ /* * Copyright 2000-2009 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 + * 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 + * 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. + * 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.javaee; diff --git a/xml/impl/src/com/intellij/lang/dtd/DTDLanguage.java b/xml/impl/src/com/intellij/lang/dtd/DTDLanguage.java index 5f8ecff99a..ae1254e3c1 100644 --- a/xml/impl/src/com/intellij/lang/dtd/DTDLanguage.java +++ b/xml/impl/src/com/intellij/lang/dtd/DTDLanguage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.dtd; import com.intellij.ide.highlighter.XmlFileHighlighter; diff --git a/xml/impl/src/com/intellij/lang/dtd/DTDParserDefinition.java b/xml/impl/src/com/intellij/lang/dtd/DTDParserDefinition.java index 6673986eb8..737f96b342 100644 --- a/xml/impl/src/com/intellij/lang/dtd/DTDParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/dtd/DTDParserDefinition.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.dtd; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/lang/dtd/DtdStructureViewBuilderFactory.java b/xml/impl/src/com/intellij/lang/dtd/DtdStructureViewBuilderFactory.java index 3da5191cb6..f88cafeb3e 100644 --- a/xml/impl/src/com/intellij/lang/dtd/DtdStructureViewBuilderFactory.java +++ b/xml/impl/src/com/intellij/lang/dtd/DtdStructureViewBuilderFactory.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.dtd; diff --git a/xml/impl/src/com/intellij/lang/html/HTMLLanguage.java b/xml/impl/src/com/intellij/lang/html/HTMLLanguage.java index 5c74b5015d..5188c7f94d 100644 --- a/xml/impl/src/com/intellij/lang/html/HTMLLanguage.java +++ b/xml/impl/src/com/intellij/lang/html/HTMLLanguage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.html; import com.intellij.ide.highlighter.HtmlFileHighlighter; diff --git a/xml/impl/src/com/intellij/lang/html/HTMLParser.java b/xml/impl/src/com/intellij/lang/html/HTMLParser.java index 661e79554f..e4f89c6b7e 100644 --- a/xml/impl/src/com/intellij/lang/html/HTMLParser.java +++ b/xml/impl/src/com/intellij/lang/html/HTMLParser.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.html; diff --git a/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java b/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java index 8ea64c9612..950e96e183 100644 --- a/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.html; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java index 6b775be270..92578f56e6 100644 --- a/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/html/HtmlFormattingModelBuilder.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.html; diff --git a/xml/impl/src/com/intellij/lang/html/HtmlParsing.java b/xml/impl/src/com/intellij/lang/html/HtmlParsing.java index f0d297d84f..7c2ca9d74e 100644 --- a/xml/impl/src/com/intellij/lang/html/HtmlParsing.java +++ b/xml/impl/src/com/intellij/lang/html/HtmlParsing.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.html; diff --git a/xml/impl/src/com/intellij/lang/xhtml/XHTMLLanguage.java b/xml/impl/src/com/intellij/lang/xhtml/XHTMLLanguage.java index 5ae8c11d7a..4faf99eafa 100644 --- a/xml/impl/src/com/intellij/lang/xhtml/XHTMLLanguage.java +++ b/xml/impl/src/com/intellij/lang/xhtml/XHTMLLanguage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xhtml; import com.intellij.ide.highlighter.XmlFileHighlighter; diff --git a/xml/impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java b/xml/impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java index a1c3634a4f..94d6d9a416 100644 --- a/xml/impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/xhtml/XHTMLParserDefinition.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xhtml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java index be076c1ee4..d88dcfe267 100644 --- a/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/xhtml/XhtmlFormattingModelBuilder.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xhtml; diff --git a/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java b/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java index 87a7512c6e..94dc9395a0 100644 --- a/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java +++ b/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.codeInsight.daemon.Validator; diff --git a/xml/impl/src/com/intellij/lang/xml/XMLLanguage.java b/xml/impl/src/com/intellij/lang/xml/XMLLanguage.java index f5c975cc4b..c23099c937 100644 --- a/xml/impl/src/com/intellij/lang/xml/XMLLanguage.java +++ b/xml/impl/src/com/intellij/lang/xml/XMLLanguage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.ide.highlighter.XmlFileHighlighter; diff --git a/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java b/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java index 3e4f807a9f..f7535b20d9 100644 --- a/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlASTFactory.java b/xml/impl/src/com/intellij/lang/xml/XmlASTFactory.java index d707ca75ec..ee0874fd51 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlASTFactory.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlASTFactory.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xml; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java b/xml/impl/src/com/intellij/lang/xml/XmlCommenter.java similarity index 53% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java copy to xml/impl/src/com/intellij/lang/xml/XmlCommenter.java index 3450dfc540..470103694c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/EditedElementDescription.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlCommenter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,22 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.lang.xml; -import com.intellij.util.xml.DomElement; -import com.intellij.psi.xml.XmlFile; -import org.jetbrains.annotations.Nullable; +import com.intellij.lang.Commenter; /** - * @author peter + * @author max */ -public abstract class EditedElementDescription { - @Nullable - public XmlFile getEditedFile() { +public class XmlCommenter implements Commenter { + + public String getLineCommentPrefix() { return null; } - @Nullable - public abstract T find(); - public abstract void initialize(T element); - public abstract T addElement(); + + public String getBlockCommentPrefix() { + return ""; + } + + public String getCommentedBlockCommentPrefix() { + return "<!–"; + } + + public String getCommentedBlockCommentSuffix() { + return "–>"; + } } diff --git a/xml/impl/src/com/intellij/lang/xml/XmlEnclosingTagUnwrapper.java b/xml/impl/src/com/intellij/lang/xml/XmlEnclosingTagUnwrapper.java index e72a5599d4..6f96e8d1cd 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlEnclosingTagUnwrapper.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlEnclosingTagUnwrapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.codeInsight.unwrap.Unwrapper; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java index 4fce6bba40..b74df136d6 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProviderFactory.java b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProviderFactory.java index a16b4201a9..5868d700d4 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProviderFactory.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProviderFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.psi.FileViewProviderFactory; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java b/xml/impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java index 7d04c2480f..c9154bd2d6 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.find.impl.HelpID; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java b/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java index 5920c0fd10..4428eac023 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.application.options.editor.XmlFoldingSettings; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java index c37b4faaa9..522a645571 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xml; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java index b9a8ad4c2b..10ec04ca8b 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModelBuilder.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xml; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java b/xml/impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java index 78601c4400..c5d8737e32 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xml; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlSurroundDescriptor.java b/xml/impl/src/com/intellij/lang/xml/XmlSurroundDescriptor.java index 30a6a3aaec..44d71f5e63 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlSurroundDescriptor.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlSurroundDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.codeInsight.template.HtmlContextType; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlUnwrapDescriptor.java b/xml/impl/src/com/intellij/lang/xml/XmlUnwrapDescriptor.java index 0e0b3f244e..02d960a7e2 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlUnwrapDescriptor.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlUnwrapDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lang.xml; import com.intellij.codeInsight.unwrap.UnwrapDescriptor; diff --git a/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java b/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java index 22a35272ce..951a31f58c 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.lang.xml; diff --git a/xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java b/xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java index ac93732734..5212dd049c 100644 --- a/xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.codeInsight.completion.CompletionUtil; diff --git a/xml/impl/src/com/intellij/lexer/DtdHighlightingLexer.java b/xml/impl/src/com/intellij/lexer/DtdHighlightingLexer.java index 41b2d7f13e..9d20d761c5 100644 --- a/xml/impl/src/com/intellij/lexer/DtdHighlightingLexer.java +++ b/xml/impl/src/com/intellij/lexer/DtdHighlightingLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.psi.tree.IElementType; diff --git a/xml/impl/src/com/intellij/lexer/HtmlHighlightingLexer.java b/xml/impl/src/com/intellij/lexer/HtmlHighlightingLexer.java index 97392ec68d..9a80a481b6 100644 --- a/xml/impl/src/com/intellij/lexer/HtmlHighlightingLexer.java +++ b/xml/impl/src/com/intellij/lexer/HtmlHighlightingLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/lexer/HtmlLexer.java b/xml/impl/src/com/intellij/lexer/HtmlLexer.java index 8caa6407aa..f61184f7c7 100644 --- a/xml/impl/src/com/intellij/lexer/HtmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/HtmlLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.psi.TokenType; diff --git a/xml/impl/src/com/intellij/lexer/OldXmlLexer.java b/xml/impl/src/com/intellij/lexer/OldXmlLexer.java index 2a8afd1aef..3b66eb7068 100644 --- a/xml/impl/src/com/intellij/lexer/OldXmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/OldXmlLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.psi.tree.IElementType; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java b/xml/impl/src/com/intellij/lexer/XHtmlHighlightingLexer.java similarity index 59% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java copy to xml/impl/src/com/intellij/lexer/XHtmlHighlightingLexer.java index 5533e7df8e..72880371f0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/StringColumnInfo.java +++ b/xml/impl/src/com/intellij/lexer/XHtmlHighlightingLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.lexer; -import com.intellij.util.xml.DomElement; +public class XHtmlHighlightingLexer extends HtmlHighlightingLexer { + public XHtmlHighlightingLexer() { + this(new XmlLexer()); + } -/** - * @author peter - */ -public class StringColumnInfo extends DomColumnInfo { - public StringColumnInfo(final String name) { - super(name); + public XHtmlHighlightingLexer(Lexer baseLexer) { + super(baseLexer,false); } - public String valueOf(final T object) { - return object.getPresentation().getTypeName(); + protected boolean isHtmlTagState(int state) { + return state == __XmlLexer.TAG || state == __XmlLexer.END_TAG; } -} +} \ No newline at end of file diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java b/xml/impl/src/com/intellij/lexer/XHtmlLexer.java similarity index 63% copy from xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java copy to xml/impl/src/com/intellij/lexer/XHtmlLexer.java index 01b79aa8e7..7b3ea972fc 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java +++ b/xml/impl/src/com/intellij/lexer/XHtmlLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,20 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.psi.xml; - -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; +package com.intellij.lexer; /** * Created by IntelliJ IDEA. - * User: maxim.mossienko - * Date: Jan 13, 2006 - * Time: 6:56:44 PM + * User: Maxim.Mossienko + * Date: Oct 7, 2004 + * Time: 5:17:07 PM * To change this template use File | Settings | File Templates. */ -public interface XmlConditionalSection extends XmlElement { - boolean isIncluded(PsiFile target); - PsiElement getBodyStart(); +public class XHtmlLexer extends HtmlLexer { + public XHtmlLexer(Lexer baseLexer) { + super(baseLexer,false); + } + + public XHtmlLexer() { + this(new XmlLexer()); + } + + protected boolean isHtmlTagState(int state) { + return state == __XmlLexer.TAG; + } } diff --git a/xml/impl/src/com/intellij/lexer/XmlHighlightingLexer.java b/xml/impl/src/com/intellij/lexer/XmlHighlightingLexer.java index 8e6582f34b..e485774884 100644 --- a/xml/impl/src/com/intellij/lexer/XmlHighlightingLexer.java +++ b/xml/impl/src/com/intellij/lexer/XmlHighlightingLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.psi.tree.IElementType; diff --git a/xml/impl/src/com/intellij/lexer/XmlLexer.java b/xml/impl/src/com/intellij/lexer/XmlLexer.java index 3c4e66875b..2f734078a9 100644 --- a/xml/impl/src/com/intellij/lexer/XmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/XmlLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.lexer; import com.intellij.psi.tree.IElementType; diff --git a/xml/impl/src/com/intellij/lexer/_HtmlLexer.java b/xml/impl/src/com/intellij/lexer/_HtmlLexer.java index dc994c644a..a614d25daf 100644 --- a/xml/impl/src/com/intellij/lexer/_HtmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/_HtmlLexer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2000-2009 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. + */ + /* The following code was generated by JFlex 1.4.1 on 01.06.09 13:59 */ /* It's an automatically generated code. Do not modify it. */ diff --git a/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java b/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java index 2bac87ce3e..b7ce713364 100644 --- a/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2000-2009 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. + */ + /* The following code was generated by JFlex 1.4.1 on 12/21/06 11:03 PM */ /* It's an automatically generated code. Do not modify it. */ diff --git a/xml/impl/src/com/intellij/lexer/_XmlLexer.java b/xml/impl/src/com/intellij/lexer/_XmlLexer.java index 4c8b219930..fb8c9a00af 100644 --- a/xml/impl/src/com/intellij/lexer/_XmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/_XmlLexer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2000-2009 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. + */ + /* The following code was generated by JFlex 1.4 on 3/14/05 5:43 PM */ /* It's an automatically generated code. Do not modify it. */ diff --git a/xml/impl/src/com/intellij/lexer/__XmlLexer.java b/xml/impl/src/com/intellij/lexer/__XmlLexer.java index 651fd27230..205b197a5f 100644 --- a/xml/impl/src/com/intellij/lexer/__XmlLexer.java +++ b/xml/impl/src/com/intellij/lexer/__XmlLexer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2000-2009 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. + */ + /* The following code was generated by JFlex 1.4.1 on 9/1/07 12:05 PM */ /* It's an automatically generated code. Do not modify it. */ diff --git a/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java b/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java index 3150da09a9..810c3a53e0 100644 --- a/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java +++ b/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.options.colors.pages; diff --git a/xml/impl/src/com/intellij/openapi/options/colors/pages/XMLColorsPage.java b/xml/impl/src/com/intellij/openapi/options/colors/pages/XMLColorsPage.java index 233c2eb147..e968f73d8c 100644 --- a/xml/impl/src/com/intellij/openapi/options/colors/pages/XMLColorsPage.java +++ b/xml/impl/src/com/intellij/openapi/options/colors/pages/XMLColorsPage.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.options.colors.pages; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectChangeSetImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectChangeSetImpl.java index 183660bbe6..dc1efb4d92 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectChangeSetImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectChangeSetImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java index a22e281a63..a92f6023c5 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlAttributeSetImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlAttributeSetImpl.java index 05224704fb..df7ac29de0 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlAttributeSetImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlAttributeSetImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlDocumentChangedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlDocumentChangedImpl.java index 189d9621e6..508831b47b 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlDocumentChangedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlDocumentChangedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java index a630f93fe6..50b1632fc0 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.xml.XmlChangeVisitor; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java index f7c67306a9..a4cd943349 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java index c6f0112e93..2568cb9459 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java index 27f1b500ac..23c88d4012 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagNameChangedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagNameChangedImpl.java index e8ac46999b..3457fe1414 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagNameChangedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagNameChangedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.pom.PomModel; diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTextChangedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTextChangedImpl.java index d0ae4292d5..b191996f54 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTextChangedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTextChangedImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.pom.xml.impl.events; import com.intellij.openapi.util.text.StringUtil; diff --git a/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java b/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java index 966dae1174..f447b73127 100644 --- a/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java +++ b/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi; import com.intellij.lang.*; diff --git a/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java b/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java index dfe8a84f87..314465a949 100644 --- a/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java +++ b/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/filters/TagNameFilter.java b/xml/impl/src/com/intellij/psi/filters/TagNameFilter.java index 52ad3925bb..e1846cd391 100644 --- a/xml/impl/src/com/intellij/psi/filters/TagNameFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/TagNameFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters; import com.intellij.psi.xml.XmlTag; diff --git a/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java b/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java index 2d8c32a151..0a7ce9e6cb 100644 --- a/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java b/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java index 95e826c15e..f11d806633 100644 --- a/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters; import com.intellij.psi.PsiElement; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java b/xml/impl/src/com/intellij/psi/filters/XmlTagFilter.java similarity index 56% copy from xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java copy to xml/impl/src/com/intellij/psi/filters/XmlTagFilter.java index 01b79aa8e7..2b2e7737bf 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java +++ b/xml/impl/src/com/intellij/psi/filters/XmlTagFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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,19 +14,24 @@ * limitations under the License. */ -package com.intellij.psi.xml; +/* + * @author max + */ +package com.intellij.psi.filters; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; +import com.intellij.psi.xml.XmlTag; -/** - * Created by IntelliJ IDEA. - * User: maxim.mossienko - * Date: Jan 13, 2006 - * Time: 6:56:44 PM - * To change this template use File | Settings | File Templates. - */ -public interface XmlConditionalSection extends XmlElement { - boolean isIncluded(PsiFile target); - PsiElement getBodyStart(); +public class XmlTagFilter implements ElementFilter { + public static final XmlTagFilter INSTANCE = new XmlTagFilter(); + + private XmlTagFilter() {} + + public boolean isAcceptable(Object element, PsiElement context) { + return element instanceof XmlTag; + } + + public boolean isClassAcceptable(Class hintClass) { + return true; + } } diff --git a/xml/impl/src/com/intellij/psi/filters/XmlTextFilter.java b/xml/impl/src/com/intellij/psi/filters/XmlTextFilter.java index 45b53492a4..9f63343261 100644 --- a/xml/impl/src/com/intellij/psi/filters/XmlTextFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/XmlTextFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/psi/filters/getters/HtmlAttributeValueGetter.java b/xml/impl/src/com/intellij/psi/filters/getters/HtmlAttributeValueGetter.java index a3b357fc2e..05bc0acf49 100644 --- a/xml/impl/src/com/intellij/psi/filters/getters/HtmlAttributeValueGetter.java +++ b/xml/impl/src/com/intellij/psi/filters/getters/HtmlAttributeValueGetter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.getters; import com.intellij.openapi.vfs.CharsetToolkit; diff --git a/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java b/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java index 93dd209f65..15329b8a55 100644 --- a/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java +++ b/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.getters; import com.intellij.codeInsight.completion.CompletionContext; diff --git a/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java b/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java index 01cc9d4207..ea39b3fa2d 100644 --- a/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.position; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/psi/filters/position/TargetNamespaceFilter.java b/xml/impl/src/com/intellij/psi/filters/position/TargetNamespaceFilter.java index 1ea2a9510a..f64fe8b158 100644 --- a/xml/impl/src/com/intellij/psi/filters/position/TargetNamespaceFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/position/TargetNamespaceFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.position; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/psi/filters/position/XmlTokenTypeFilter.java b/xml/impl/src/com/intellij/psi/filters/position/XmlTokenTypeFilter.java index 7852008766..c323476b61 100644 --- a/xml/impl/src/com/intellij/psi/filters/position/XmlTokenTypeFilter.java +++ b/xml/impl/src/com/intellij/psi/filters/position/XmlTokenTypeFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.position; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/formatter/XmlFormatterUtilHelper.java b/xml/impl/src/com/intellij/psi/formatter/XmlFormatterUtilHelper.java index 2c5b253237..fb39592bd8 100644 --- a/xml/impl/src/com/intellij/psi/formatter/XmlFormatterUtilHelper.java +++ b/xml/impl/src/com/intellij/psi/formatter/XmlFormatterUtilHelper.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.formatter; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java index 216298b65e..6566f77fbf 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java index 72cb456a50..3dc996af65 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AnotherLanguageBlockWrapper.java b/xml/impl/src/com/intellij/psi/formatter/xml/AnotherLanguageBlockWrapper.java index a349fafe43..3ea6245718 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/AnotherLanguageBlockWrapper.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/AnotherLanguageBlockWrapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.Block; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/HtmlPolicy.java b/xml/impl/src/com/intellij/psi/formatter/xml/HtmlPolicy.java index 56c3f86b4a..f3e35acaff 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/HtmlPolicy.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/HtmlPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.FormattingDocumentModel; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/InjectedLanguageBlockWrapper.java b/xml/impl/src/com/intellij/psi/formatter/xml/InjectedLanguageBlockWrapper.java index e5e9451273..b3ff2bb19e 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/InjectedLanguageBlockWrapper.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/InjectedLanguageBlockWrapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/ReadOnlyBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/ReadOnlyBlock.java index 7ef7b68feb..4e97d5ab88 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/ReadOnlyBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/ReadOnlyBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java index 426d06534b..10c62ee65a 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java index 6c5a137979..790ba2ff1c 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java index 5d86f16255..c12815d7fa 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.Block; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java index bdb3c8e68e..aa74224778 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.FormattingDocumentModel; diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlTagBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlTagBlock.java index 0db89ac3f6..62bca681b6 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlTagBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlTagBlock.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.formatter.xml; import com.intellij.formatting.*; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java similarity index 52% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java index c5d320d77d..2fe6de3c3e 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.HtmlHighlightingLexer; +import com.intellij.lexer.Lexer; +import com.intellij.psi.impl.cache.impl.BaseFilterLexer; +import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class HtmlIdIndexer extends LexerBasedIdIndexer { + protected Lexer createLexer(final BaseFilterLexer.OccurrenceConsumer consumer) { + return new XHtmlFilterLexer(new HtmlHighlightingLexer(), consumer); } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java similarity index 52% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java index c5d320d77d..b0a7c5496a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.HtmlHighlightingLexer; +import com.intellij.lexer.Lexer; +import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer; +import com.intellij.psi.impl.cache.impl.todo.TodoOccurrenceConsumer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class HtmlTodoIndexer extends LexerBasedTodoIndexer { + protected Lexer createLexer(final TodoOccurrenceConsumer consumer) { + return new XHtmlFilterLexer(new HtmlHighlightingLexer(), consumer); } } diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java index abdd6849fe..99c4c3ce2d 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.cache.impl.idCache; import com.intellij.lang.Language; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java similarity index 52% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java index c5d320d77d..c9c33e5a3b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.Lexer; +import com.intellij.lexer.XHtmlHighlightingLexer; +import com.intellij.psi.impl.cache.impl.BaseFilterLexer; +import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class XHtmlIdIndexer extends LexerBasedIdIndexer { + protected Lexer createLexer(final BaseFilterLexer.OccurrenceConsumer consumer) { + return new XHtmlFilterLexer(new XHtmlHighlightingLexer(), consumer); } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java similarity index 52% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java index c5d320d77d..a2b56dcc2b 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.Lexer; +import com.intellij.lexer.XHtmlHighlightingLexer; +import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer; +import com.intellij.psi.impl.cache.impl.todo.TodoOccurrenceConsumer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class XHtmlTodoIndexer extends LexerBasedTodoIndexer { + protected Lexer createLexer(final TodoOccurrenceConsumer consumer) { + return new XHtmlFilterLexer(new XHtmlHighlightingLexer(), consumer); } } diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlFilterLexer.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlFilterLexer.java index cfc3c9bc43..cd1326b935 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlFilterLexer.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlFilterLexer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.cache.impl.idCache; import com.intellij.lexer.Lexer; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java similarity index 54% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java index c5d320d77d..723328dc9a 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.Lexer; +import com.intellij.lexer.XmlLexer; +import com.intellij.psi.impl.cache.impl.BaseFilterLexer; +import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class XmlIdIndexer extends LexerBasedIdIndexer { + protected Lexer createLexer(final BaseFilterLexer.OccurrenceConsumer consumer) { + return new XmlFilterLexer(new XmlLexer(), consumer); } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java similarity index 54% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java index c5d320d77d..a5dc61c585 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.cache.impl.idCache; -/** - * @author peter - */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; - - public final int getRowCount() { - return myRowCount; - } +import com.intellij.lexer.Lexer; +import com.intellij.lexer.XmlLexer; +import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer; +import com.intellij.psi.impl.cache.impl.todo.TodoOccurrenceConsumer; - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; +public class XmlTodoIndexer extends LexerBasedTodoIndexer { + protected Lexer createLexer(final TodoOccurrenceConsumer consumer) { + return new XmlFilterLexer(new XmlLexer(), consumer); } } diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjector.java b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjector.java index 5708b1853a..c77d779186 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjector.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjector.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html; import com.intellij.lang.ASTNode; diff --git a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlDocumentImpl.java similarity index 57% copy from xml/openapi/src/com/intellij/psi/html/HtmlTag.java copy to xml/impl/src/com/intellij/psi/impl/source/html/HtmlDocumentImpl.java index 279f3433bc..7aa9ce9f2d 100644 --- a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlDocumentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.html; +package com.intellij.psi.impl.source.html; +import com.intellij.psi.impl.source.xml.XmlDocumentImpl; +import com.intellij.psi.xml.XmlElementType; import com.intellij.psi.xml.XmlTag; /** - * Created by IntelliJ IDEA. - * User: maxim - * Date: 03.11.2004 - * Time: 11:16:25 - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ -public interface HtmlTag extends XmlTag { +public class HtmlDocumentImpl extends XmlDocumentImpl { + public HtmlDocumentImpl() { + super(XmlElementType.HTML_DOCUMENT); + } + + public XmlTag getRootTag() { + return (XmlTag)findElementByTokenType(XmlElementType.HTML_TAG); + } } diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlFileImpl.java b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlFileImpl.java index 362f660905..66bd65f126 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlFileImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlFileImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlTagImpl.java b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlTagImpl.java index 81b1c181a7..f7e8c13b9f 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlTagImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlTagImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html; import com.intellij.psi.html.HtmlTag; diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java b/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java index 5716bf37cb..2f9d8a6c4e 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html; import com.intellij.openapi.util.Key; diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java index be04ca30a5..75f8ae526b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html.dtd; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java index 6aafca8e69..d831839b0b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html.dtd; import com.intellij.html.impl.RelaxedHtmlFromSchemaElementDescriptor; diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java index c04ce4116a..6b34cda2cd 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.html.dtd; import com.intellij.html.impl.RelaxedHtmlFromSchemaNSDescriptor; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/HtmlBuilderDriver.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/HtmlBuilderDriver.java index d729b0e8b4..ed9176ea35 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/HtmlBuilderDriver.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/HtmlBuilderDriver.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.impl.source.parsing.xml; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java index 6795736aab..a4b3a4e2cc 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.parsing.xml; import com.intellij.codeInsight.daemon.XmlErrorMessages; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java index 55db65af28..0594a7063c 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilder.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.impl.source.parsing.xml; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java index 3c84b3670a..37a084c3a2 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlBuilderDriver.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.impl.source.parsing.xml; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParser.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParser.java index 20baa919c1..3878fbf2a0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParser.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParser.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.impl.source.parsing.xml; diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsing.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsing.java index c33ace3d6d..87c8623421 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsing.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsing.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi.impl.source.parsing.xml; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsingContext.java similarity index 55% copy from xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java copy to xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsingContext.java index c5d320d77d..fb7de2c709 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/MultiLineTextPanel.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlParsingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,19 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml.ui; +package com.intellij.psi.impl.source.parsing.xml; + +import com.intellij.psi.impl.source.ParsingContext; +import com.intellij.util.CharTable; /** - * @author peter + * @author ven */ -public class MultiLineTextPanel extends TextPanel{ - private int myRowCount = 3; +public class XmlParsingContext extends ParsingContext { + protected final OldXmlParsing myXmlParsing; - public final int getRowCount() { - return myRowCount; + public OldXmlParsing getXmlParsing() { + return myXmlParsing; } - public final void setRowCount(final int rowCount) { - myRowCount = rowCount; + public XmlParsingContext(final CharTable table) { + super(table); + myXmlParsing = new OldXmlParsing(this); } } diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlToken.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlPsiLexer.java similarity index 56% copy from xml/openapi/src/com/intellij/psi/xml/XmlToken.java copy to xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlPsiLexer.java index 7c0dd64aea..78402417bb 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlToken.java +++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/XmlPsiLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,14 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.psi.impl.source.parsing.xml; +import com.intellij.lexer.OldXmlLexer; +import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; - +import com.intellij.psi.xml.XmlTokenType; /** * @author Mike */ -public interface XmlToken extends XmlElement{ - IElementType getTokenType(); +public class XmlPsiLexer extends OldXmlLexer{ + public XmlPsiLexer() { + } + + public IElementType getTokenType() { + IElementType type = super.getTokenType(); + + if (type == XmlTokenType.XML_WHITE_SPACE) { + return TokenType.WHITE_SPACE; + } + + return type; + } } diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java index 91101ecd2a..77074ed92c 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.manipulators; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java index 675bd5008e..bd6455a001 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.manipulators; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java index 46131212be..843f2b2494 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.manipulators; import com.intellij.openapi.util.TextRange; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java index 0c72110371..3e734d337b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.manipulators; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java index ad04a8ac63..e21796ab9f 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.manipulators; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/AttributeValueSelfReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/AttributeValueSelfReference.java index 64c220fb09..7a687801d2 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/AttributeValueSelfReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/AttributeValueSelfReference.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java index a7949361f8..91166e4bc2 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java index 57a1bdbb2d..7924a6a085 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java index baa146465d..1fc27f0183 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; import com.intellij.psi.util.CachedValue; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java index 083fd9de82..1c884cde28 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java index 1f801b03fd..b479f565cb 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java index 760417953b..0dc8b5e534 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; import com.intellij.codeInsight.CodeInsightUtilBase; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java index 156e6a073d..2e6442f03b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; import com.intellij.codeInsight.daemon.QuickFixProvider; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java index 1c35fe5c1a..abc239fbd0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.resolve.reference.impl.providers; import com.intellij.psi.PsiReference; diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java b/xml/impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java index 9e14608d61..e1d0624b2a 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java +++ b/xml/impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.tree; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java b/xml/impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java index 68bf661bab..db3128d8c9 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java +++ b/xml/impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.tree; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java index 2d2ef76c71..21606615f0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java +++ b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.tree.injected; import com.intellij.psi.impl.source.xml.XmlAttributeValueImpl; diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java index 029c05fbef..8426623a83 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java +++ b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.tree.injected; import com.intellij.psi.LiteralTextEscaper; diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java index e2faff2d97..3182a969f0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java +++ b/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.tree.injected; import com.intellij.openapi.util.TextRange; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java index 40a872afc2..b1a0683c35 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.codeInsight.TailType; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java index cbd5763d6c..5033964500 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java index 2c4014671b..fd6b480ea3 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.ide.util.EditSourceUtil; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java index c4ba5a065e..86ccadfba8 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.codeInsight.daemon.QuickFixProvider; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java index 8c1a7e5cc5..e83a20d806 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java index 7b6ed010ae..c9a0eba497 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.openapi.util.Pair; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java index bebf2f171f..34c07935c6 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDeclImpl.java index 623966940e..da165b63c4 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.psi.PsiElementVisitor; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java index 9094bd75d6..b1fd03fb05 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java index 906bb5ca76..e9631b490a 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementChangeUtil.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementChangeUtil.java index 797f97a6c1..6a48ffea86 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementChangeUtil.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementChangeUtil.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: Maxim.Mossienko * Date: Oct 18, 2006 diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java index 2a5fb7671c..74e476830b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java index 637bbf8250..2685a8bb65 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDescriptorProvider.java similarity index 57% copy from xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java copy to xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDescriptorProvider.java index bf35ad77a0..6940bcf497 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementDescriptorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,17 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.psi.impl.source.xml; +import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.psi.xml.XmlTag; +import com.intellij.xml.XmlElementDescriptor; import org.jetbrains.annotations.Nullable; -import java.lang.annotation.Annotation; - /** - * @author peter + * @author yole */ -public interface AnnotatedElement { +public interface XmlElementDescriptorProvider { + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.xml.elementDescriptorProvider"); @Nullable - T getAnnotation(Class annotationClass); + XmlElementDescriptor getDescriptor(XmlTag tag); } diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementImpl.java index c0b0b6ba14..a61850106e 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlElementImpl.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Aug 26, 2002 diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java index 39e8cef301..9fdf0b8b9f 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java index 37ea1c89ef..a1051534bc 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.openapi.fileTypes.StdFileTypes; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEnumeratedTypeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEnumeratedTypeImpl.java index a675950a3d..2390f7fc31 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEnumeratedTypeImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEnumeratedTypeImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.psi.filters.position.XmlTokenTypeFilter; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java index 22dc8c3602..322770c277 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.html.HTMLLanguage; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlMarkupDeclImpl.java similarity index 54% copy from xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java copy to xml/impl/src/com/intellij/psi/impl/source/xml/XmlMarkupDeclImpl.java index 71ea8e4cfc..a022992fa3 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlMarkupDeclImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; - -import com.intellij.psi.PsiNameIdentifierOwner; -import com.intellij.psi.meta.PsiMetaOwner; -import org.jetbrains.annotations.Nullable; +package com.intellij.psi.impl.source.xml; +import com.intellij.psi.impl.meta.MetaRegistry; +import com.intellij.psi.meta.PsiMetaData; +import com.intellij.psi.xml.XmlElementType; +import com.intellij.psi.xml.XmlMarkupDecl; /** * @author Mike */ -public interface XmlElementDecl extends XmlElement, PsiMetaOwner, PsiNameIdentifierOwner { - XmlElement getNameElement(); - @Nullable String getName(); - XmlElementContentSpec getContentSpecElement(); +public class XmlMarkupDeclImpl extends XmlElementImpl implements XmlMarkupDecl { + public XmlMarkupDeclImpl() { + super(XmlElementType.XML_MARKUP_DECL); + } + + public PsiMetaData getMetaData(){ + return MetaRegistry.getMeta(this); + } + } diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java index 2cf5f134ab..e7e07a27b0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlProcessingInstructionImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlProcessingInstructionImpl.java index 51c0b5f95f..645d8cfe47 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlProcessingInstructionImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlProcessingInstructionImpl.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Jul 31, 2002 diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java index 5aceb7409e..88b5349516 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPsiPolicy.java similarity index 68% copy from xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java copy to xml/impl/src/com/intellij/psi/impl/source/xml/XmlPsiPolicy.java index c9d67b9b7c..dfe1fd56e8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/MutableGenericValue.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPsiPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.psi.impl.source.xml; -package com.intellij.util.xml; - -/** - * @author Gregory.Shrago - */ -public interface MutableGenericValue extends GenericValue { - - void setStringValue(String value); - - void setValue(T value); +import com.intellij.lang.ASTNode; +import com.intellij.psi.PsiElement; +public interface XmlPsiPolicy { + ASTNode encodeXmlTextContents(String displayText, PsiElement text); } diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java index 6e42eef8dc..f9d7acf2b0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java index 9e7c9cb64f..c9624200c9 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java index e804c622fb..ff759239a3 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTokenImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTokenImpl.java index 5f71b0fd4f..79f9fe9e4b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTokenImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTokenImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml; import com.intellij.ide.util.EditSourceUtil; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/CDATAOnAnyEncodedPolicy.java b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/CDATAOnAnyEncodedPolicy.java index 2048d8b324..c22c6d9c0b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/CDATAOnAnyEncodedPolicy.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/CDATAOnAnyEncodedPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml.behavior; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java index 8e023bb5b6..727e634a5b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml.behavior; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java index 24651c1f5e..ebb0117210 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml.behavior; import com.intellij.lang.ASTFactory; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/dtd/DTDElementType.java b/xml/impl/src/com/intellij/psi/impl/source/xml/dtd/DTDElementType.java index 795462b6c8..e54aa86e64 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/dtd/DTDElementType.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/dtd/DTDElementType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.impl.source.xml.dtd; import com.intellij.psi.tree.xml.IDTDElementType; diff --git a/xml/impl/src/com/intellij/psi/xml/DTDTokenType.java b/xml/impl/src/com/intellij/psi/xml/DTDTokenType.java index 342a83a987..ba2589f83b 100644 --- a/xml/impl/src/com/intellij/psi/xml/DTDTokenType.java +++ b/xml/impl/src/com/intellij/psi/xml/DTDTokenType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.xml; import com.intellij.psi.tree.IElementType; diff --git a/xml/impl/src/com/intellij/psi/xml/XmlChildRole.java b/xml/impl/src/com/intellij/psi/xml/XmlChildRole.java index 54b80bb759..37bf06afe6 100644 --- a/xml/impl/src/com/intellij/psi/xml/XmlChildRole.java +++ b/xml/impl/src/com/intellij/psi/xml/XmlChildRole.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.xml; import com.intellij.lang.ASTNode; diff --git a/xml/impl/src/com/intellij/psi/xml/XmlElementType.java b/xml/impl/src/com/intellij/psi/xml/XmlElementType.java index d32fc9cbbf..804d874869 100644 --- a/xml/impl/src/com/intellij/psi/xml/XmlElementType.java +++ b/xml/impl/src/com/intellij/psi/xml/XmlElementType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.xml; import com.intellij.lang.ASTNode; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java b/xml/impl/src/com/intellij/psi/xml/XmlTextElementType.java similarity index 64% copy from xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java copy to xml/impl/src/com/intellij/psi/xml/XmlTextElementType.java index bc5f04248f..911981f03d 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java +++ b/xml/impl/src/com/intellij/psi/xml/XmlTextElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; - -import org.jetbrains.annotations.Nullable; -/** - * @author Mike +/* + * @author max */ -public interface XmlAttlistDecl extends XmlElement { - XmlAttlistDecl[] EMPTY_ARRAY = new XmlAttlistDecl[0]; +package com.intellij.psi.xml; + +import com.intellij.psi.tree.IStrongWhitespaceHolderElementType; +import com.intellij.psi.tree.xml.IXmlElementType; - XmlElement getNameElement(); - @Nullable String getName(); - XmlAttributeDecl[] getAttributeDecls(); -} +class XmlTextElementType extends IXmlElementType implements IStrongWhitespaceHolderElementType { + public XmlTextElementType() { + super("XML_TEXT"); + } +} \ No newline at end of file diff --git a/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java b/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java index 72dc0d89f4..26f89264c0 100644 --- a/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java +++ b/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.refactoring.rename; import com.intellij.openapi.diagnostic.Logger; diff --git a/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java b/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java index 9ffd0b1bb1..dac3df8c69 100644 --- a/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java +++ b/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.refactoring.util; import com.intellij.psi.ElementDescriptionLocation; diff --git a/xml/impl/src/com/intellij/usageView/XmlUsageViewDescriptionProvider.java b/xml/impl/src/com/intellij/usageView/XmlUsageViewDescriptionProvider.java index 1050740bc4..8f328756b1 100644 --- a/xml/impl/src/com/intellij/usageView/XmlUsageViewDescriptionProvider.java +++ b/xml/impl/src/com/intellij/usageView/XmlUsageViewDescriptionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.usageView; import com.intellij.codeInsight.highlighting.HighlightUsagesDescriptionLocation; diff --git a/xml/impl/src/com/intellij/vcsUtil/XmlVcsSelectionProvider.java b/xml/impl/src/com/intellij/vcsUtil/XmlVcsSelectionProvider.java index a49bfbe8a6..50b92791f9 100644 --- a/xml/impl/src/com/intellij/vcsUtil/XmlVcsSelectionProvider.java +++ b/xml/impl/src/com/intellij/vcsUtil/XmlVcsSelectionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.vcsUtil; import com.intellij.codeInsight.TargetElementUtilBase; diff --git a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java index 8721a188b0..364472a70e 100644 --- a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java +++ b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml; import com.intellij.openapi.editor.Editor; diff --git a/xml/impl/src/com/intellij/xml/XmlAttributeDescriptorsProvider.java b/xml/impl/src/com/intellij/xml/XmlAttributeDescriptorsProvider.java index 71a30337b8..f235c0ea07 100644 --- a/xml/impl/src/com/intellij/xml/XmlAttributeDescriptorsProvider.java +++ b/xml/impl/src/com/intellij/xml/XmlAttributeDescriptorsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml; import com.intellij.openapi.extensions.ExtensionPointName; diff --git a/xml/impl/src/com/intellij/xml/XmlExtension.java b/xml/impl/src/com/intellij/xml/XmlExtension.java index 52ffbc5322..1fee3bc243 100644 --- a/xml/impl/src/com/intellij/xml/XmlExtension.java +++ b/xml/impl/src/com/intellij/xml/XmlExtension.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml; import com.intellij.codeInsight.daemon.impl.HighlightInfo; diff --git a/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java b/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java index 252b486ea3..01d00e4b2b 100644 --- a/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java +++ b/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml; import com.intellij.ide.highlighter.DTDFileType; diff --git a/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java b/xml/impl/src/com/intellij/xml/XmlUndefinedElementFixProvider.java similarity index 67% copy from xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java copy to xml/impl/src/com/intellij/xml/XmlUndefinedElementFixProvider.java index b1dba64f5d..097602dd71 100644 --- a/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java +++ b/xml/impl/src/com/intellij/xml/XmlUndefinedElementFixProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -15,9 +15,14 @@ */ package com.intellij.xml; -import com.intellij.psi.xml.XmlTag; +import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.psi.xml.XmlElement; import org.jetbrains.annotations.NotNull; -public interface XmlElementDescriptorWithCDataContent { - boolean requiresCdataBracesInContext(@NotNull XmlTag context); -} \ No newline at end of file +/** + * @author Dmitry Avdeev + */ +public interface XmlUndefinedElementFixProvider { + + @NotNull IntentionAction[] createFixes(final @NotNull XmlElement element); +} diff --git a/xml/impl/src/com/intellij/xml/actions/ValidateXmlAction.java b/xml/impl/src/com/intellij/xml/actions/ValidateXmlAction.java index 5c566347d4..d46767ab33 100644 --- a/xml/impl/src/com/intellij/xml/actions/ValidateXmlAction.java +++ b/xml/impl/src/com/intellij/xml/actions/ValidateXmlAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions; import com.intellij.codeInsight.CodeInsightActionHandler; diff --git a/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java b/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java index 27447fef70..ad5baade91 100644 --- a/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java +++ b/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions; import com.intellij.codeInsight.CodeInsightActionHandler; diff --git a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java index 83b7deb86c..d83452ed7b 100644 --- a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java +++ b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions; import com.intellij.codeInsight.CodeInsightUtilBase; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/FileUtils.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/FileUtils.java index 391f63f880..116bc5e082 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/FileUtils.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/FileUtils.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java index baa6f76e60..e1de1b4f8b 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java index 2d162e5db4..f980bbf176 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java index 80ba4552d2..e4055797f7 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java index 46cf9ee439..08e703816e 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; import com.intellij.openapi.project.Project; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/UIUtils.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/UIUtils.java index a2a0d82118..c1a7e5ec7f 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/UIUtils.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/UIUtils.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; import com.intellij.openapi.project.Project; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java index 0527c864dc..0bb9ba882d 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.actions.xmlbeans; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPsiItem.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPsiItem.java index 0a90f805df..207ccb23dc 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPsiItem.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPsiItem.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.breadcrumbs; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java index be2703974f..1b5217a10a 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.breadcrumbs; import com.intellij.lang.Language; diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java b/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java index 5301cb0758..4849c981d0 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: spleaner * Date: Jun 19, 2007 diff --git a/xml/impl/src/com/intellij/xml/impl/BasicXmlAttributeDescriptor.java b/xml/impl/src/com/intellij/xml/impl/BasicXmlAttributeDescriptor.java index 33e58ac4f2..020baa8205 100644 --- a/xml/impl/src/com/intellij/xml/impl/BasicXmlAttributeDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/BasicXmlAttributeDescriptor.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Aug 27, 2002 diff --git a/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java b/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java index 38833f54e4..3cdfa4eb6d 100644 --- a/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java +++ b/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl; import com.intellij.codeInsight.daemon.HighlightDisplayKey; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/impl/src/com/intellij/xml/impl/XmlAttributeDescriptorEx.java similarity index 61% copy from xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java copy to xml/impl/src/com/intellij/xml/impl/XmlAttributeDescriptorEx.java index ace8c1f21d..5af26e625f 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/impl/src/com/intellij/xml/impl/XmlAttributeDescriptorEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.xml.impl; +import com.intellij.xml.XmlAttributeDescriptor; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface XmlTagChild extends XmlElement{ - XmlTagChild[] EMPTY_ARRAY = new XmlTagChild[0]; - @Nullable - XmlTag getParentTag(); +/** + * @author peter + */ +public interface XmlAttributeDescriptorEx extends XmlAttributeDescriptor { + /** + * @param newTargetName + * @return new attribute local name + */ @Nullable - XmlTagChild getNextSiblingInTag(); - @Nullable - XmlTagChild getPrevSiblingInTag(); + @NonNls + String handleTargetRename(@NotNull @NonNls final String newTargetName); } diff --git a/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java b/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java index d5e67981d5..47edfac8aa 100644 --- a/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java +++ b/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl; import com.intellij.codeInsight.highlighting.BraceMatchingUtil; diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/BaseXmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/BaseXmlElementDescriptorImpl.java index d9074e6fa7..8e08fc8994 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/BaseXmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/BaseXmlElementDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dtd; import com.intellij.openapi.util.FieldCache; diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java index a1f416a5ac..1471fc459e 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dtd; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java index e56f9c74f3..59fc0cefcd 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dtd; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java index 6a72597603..ac49e1e6db 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.dtd; import com.intellij.codeInsight.daemon.Validator; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java index ccecba4d40..986ea48a92 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlAttributeDescriptor.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Sep 30, 2002 diff --git a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java index aaada444f1..74d63b1063 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: mike * Date: Sep 30, 2002 diff --git a/xml/impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java index 48b4dad459..1b4d11d83d 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.openapi.util.Comparing; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/NamedObjectDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/NamedObjectDescriptor.java index 864b1e6452..1635aa311e 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/NamedObjectDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/NamedObjectDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.openapi.roots.ProjectRootManager; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java index c78a7d7874..28bf1aa837 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/NullElementDescriptor.java @@ -1,3 +1,19 @@ +/* + * Copyright 2000-2009 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. + */ + /** * @author cdr */ diff --git a/xml/impl/src/com/intellij/xml/impl/schema/SchemaNSDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/SchemaNSDescriptor.java index b80db0ad98..a7891cd4b6 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/SchemaNSDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/SchemaNSDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.codeInsight.daemon.Validator; diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java b/xml/impl/src/com/intellij/xml/impl/schema/SimpleTypeDescriptor.java similarity index 73% copy from xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java copy to xml/impl/src/com/intellij/xml/impl/schema/SimpleTypeDescriptor.java index 3eddde6260..b6dc92dccf 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/SimpleTypeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.pom.xml.events; +package com.intellij.xml.impl.schema; import com.intellij.psi.xml.XmlTag; -public interface XmlTagNameChanged extends XmlChange { - String getOldName(); - - XmlTag getTag(); +/** + * @author Mike + */ +class SimpleTypeDescriptor extends TypeDescriptor { + public SimpleTypeDescriptor(XmlTag tag) { + super(); + } } diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java b/xml/impl/src/com/intellij/xml/impl/schema/StdTypeDescriptor.java similarity index 74% copy from xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java copy to xml/impl/src/com/intellij/xml/impl/schema/StdTypeDescriptor.java index 3eddde6260..0893e23129 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/StdTypeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.pom.xml.events; +package com.intellij.xml.impl.schema; import com.intellij.psi.xml.XmlTag; -public interface XmlTagNameChanged extends XmlChange { - String getOldName(); - - XmlTag getTag(); +/** + * @author Mike + */ +class StdTypeDescriptor extends TypeDescriptor { + public StdTypeDescriptor(String name) { + super(); + } } diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java b/xml/impl/src/com/intellij/xml/impl/schema/TypeDescriptor.java similarity index 79% copy from xml/openapi/src/com/intellij/psi/xml/XmlDecl.java copy to xml/impl/src/com/intellij/xml/impl/schema/TypeDescriptor.java index 65824bfabb..1a59df371d 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/TypeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.xml.impl.schema; + +import com.intellij.psi.xml.XmlTag; /** * @author Mike */ -public interface XmlDecl extends XmlElement { +public abstract class TypeDescriptor { } diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java index bf7adbdd00..d3145cfcb3 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java index fa087d3808..1289008ae7 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java index 92f7795322..7b378c71fd 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.codeInsight.daemon.Validator; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java index 74ff24444e..0e2b4ecaca 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.impl.schema; import com.intellij.codeInsight.daemon.Validator; diff --git a/xml/impl/src/com/intellij/xml/index/ExternalResourcesRootsProvider.java b/xml/impl/src/com/intellij/xml/index/ExternalResourcesRootsProvider.java index 5f1b265126..070ed962bb 100644 --- a/xml/impl/src/com/intellij/xml/index/ExternalResourcesRootsProvider.java +++ b/xml/impl/src/com/intellij/xml/index/ExternalResourcesRootsProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.codeInsight.daemon.impl.quickfix.FetchExtResourceAction; diff --git a/xml/impl/src/com/intellij/xml/index/IndexedRelevantResource.java b/xml/impl/src/com/intellij/xml/index/IndexedRelevantResource.java index f6e6855533..032a2600ec 100644 --- a/xml/impl/src/com/intellij/xml/index/IndexedRelevantResource.java +++ b/xml/impl/src/com/intellij/xml/index/IndexedRelevantResource.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.openapi.module.Module; diff --git a/xml/impl/src/com/intellij/xml/index/ResourceRelevance.java b/xml/impl/src/com/intellij/xml/index/ResourceRelevance.java index 677c4adc26..28ab829df8 100644 --- a/xml/impl/src/com/intellij/xml/index/ResourceRelevance.java +++ b/xml/impl/src/com/intellij/xml/index/ResourceRelevance.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/xml/index/XmlIndex.java b/xml/impl/src/com/intellij/xml/index/XmlIndex.java index 8436939fdd..6482bdd920 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlIndex.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.openapi.module.Module; diff --git a/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java b/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java index 741fdfd03b..a3a66f1b40 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.openapi.project.Project; diff --git a/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java b/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java index 235708a6b2..f26e370567 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.openapi.project.Project; diff --git a/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java b/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java index 399a9c5d27..7295dbd7c3 100644 --- a/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java +++ b/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.index; import com.intellij.util.xml.NanoXmlUtil; diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagInplaceRenamer.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagInplaceRenamer.java index b7f6e288fb..c2184d7206 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagInplaceRenamer.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagInplaceRenamer.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: spleaner * Date: Aug 8, 2007 diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java index 4392ac7125..2924ebe811 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: spleaner * Date: Aug 9, 2007 diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java index 7f2ac26841..f7a1b7b915 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: spleaner * Date: Aug 7, 2007 diff --git a/xml/impl/src/com/intellij/xml/util/AnchorPathReferenceProvider.java b/xml/impl/src/com/intellij/xml/util/AnchorPathReferenceProvider.java index 8ea864c2c3..ec2847a7d6 100644 --- a/xml/impl/src/com/intellij/xml/util/AnchorPathReferenceProvider.java +++ b/xml/impl/src/com/intellij/xml/util/AnchorPathReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.openapi.paths.PathReference; diff --git a/xml/impl/src/com/intellij/xml/util/AnchorReference.java b/xml/impl/src/com/intellij/xml/util/AnchorReference.java index 9b9aecd597..5434e1f4cd 100644 --- a/xml/impl/src/com/intellij/xml/util/AnchorReference.java +++ b/xml/impl/src/com/intellij/xml/util/AnchorReference.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider; diff --git a/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java b/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java index ab274372f7..7f51b32fbe 100644 --- a/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java +++ b/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.xml.util; diff --git a/xml/impl/src/com/intellij/xml/util/CheckEmptyTagInspection.java b/xml/impl/src/com/intellij/xml/util/CheckEmptyTagInspection.java index db8f993b71..55096fc9f6 100644 --- a/xml/impl/src/com/intellij/xml/util/CheckEmptyTagInspection.java +++ b/xml/impl/src/com/intellij/xml/util/CheckEmptyTagInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.xml.util; diff --git a/xml/impl/src/com/intellij/xml/util/CheckTagEmptyBodyInspection.java b/xml/impl/src/com/intellij/xml/util/CheckTagEmptyBodyInspection.java index 016396a665..59646d4a84 100644 --- a/xml/impl/src/com/intellij/xml/util/CheckTagEmptyBodyInspection.java +++ b/xml/impl/src/com/intellij/xml/util/CheckTagEmptyBodyInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.xml.util; diff --git a/xml/impl/src/com/intellij/xml/util/CheckValidXmlInScriptBodyInspection.java b/xml/impl/src/com/intellij/xml/util/CheckValidXmlInScriptBodyInspection.java index 0533318742..5487ef1161 100644 --- a/xml/impl/src/com/intellij/xml/util/CheckValidXmlInScriptBodyInspection.java +++ b/xml/impl/src/com/intellij/xml/util/CheckValidXmlInScriptBodyInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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. */ /* diff --git a/xml/impl/src/com/intellij/xml/util/CheckXmlFileWithXercesValidatorInspection.java b/xml/impl/src/com/intellij/xml/util/CheckXmlFileWithXercesValidatorInspection.java index 31ab951ff1..900ae8ed94 100644 --- a/xml/impl/src/com/intellij/xml/util/CheckXmlFileWithXercesValidatorInspection.java +++ b/xml/impl/src/com/intellij/xml/util/CheckXmlFileWithXercesValidatorInspection.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.xml.util; diff --git a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java index a760bc144c..2864fe2cac 100644 --- a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java +++ b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.lookup.DeferredUserLookupValue; diff --git a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java index 7550d4020e..413e9b71f4 100644 --- a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInspection.InspectionProfile; diff --git a/xml/impl/src/com/intellij/xml/util/UserColorLookup.java b/xml/impl/src/com/intellij/xml/util/UserColorLookup.java index 0ee9ebb707..a968e35d5d 100644 --- a/xml/impl/src/com/intellij/xml/util/UserColorLookup.java +++ b/xml/impl/src/com/intellij/xml/util/UserColorLookup.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.lookup.DeferredUserLookupValue; diff --git a/xml/impl/src/com/intellij/xml/util/XIncludeProvider.java b/xml/impl/src/com/intellij/xml/util/XIncludeProvider.java index 002c5ffb49..db5f372f4c 100644 --- a/xml/impl/src/com/intellij/xml/util/XIncludeProvider.java +++ b/xml/impl/src/com/intellij/xml/util/XIncludeProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.ide.highlighter.XmlFileType; diff --git a/xml/impl/src/com/intellij/xml/util/XmlApplicationComponent.java b/xml/impl/src/com/intellij/xml/util/XmlApplicationComponent.java index 6aef5f9a85..11a4e78043 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlApplicationComponent.java +++ b/xml/impl/src/com/intellij/xml/util/XmlApplicationComponent.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.html.impl.RelaxedHtmlFromSchemaNSDescriptor; diff --git a/xml/impl/src/com/intellij/xml/util/XmlDeclareIdInCommentAction.java b/xml/impl/src/com/intellij/xml/util/XmlDeclareIdInCommentAction.java index 3aa7abc276..4f7bec5180 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlDeclareIdInCommentAction.java +++ b/xml/impl/src/com/intellij/xml/util/XmlDeclareIdInCommentAction.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.daemon.XmlErrorMessages; diff --git a/xml/impl/src/com/intellij/xml/util/XmlDuplicatedIdInspection.java b/xml/impl/src/com/intellij/xml/util/XmlDuplicatedIdInspection.java index 4c5175ebb0..280105f15d 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlDuplicatedIdInspection.java +++ b/xml/impl/src/com/intellij/xml/util/XmlDuplicatedIdInspection.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeHighlighting.HighlightDisplayLevel; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java b/xml/impl/src/com/intellij/xml/util/XmlElementFactory.java similarity index 54% copy from xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java copy to xml/impl/src/com/intellij/xml/util/XmlElementFactory.java index 8188bdbfae..639b1697fb 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/TypeChooser.java +++ b/xml/impl/src/com/intellij/xml/util/XmlElementFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; -import com.intellij.psi.xml.XmlTag; -import com.intellij.util.IncorrectOperationException; +package com.intellij.xml.util; -import java.lang.reflect.Type; +import com.intellij.psi.PsiManager; +import com.intellij.psi.xml.XmlText; +import com.intellij.util.IncorrectOperationException; /** - * @author peter + * @author mike */ -public abstract class TypeChooser { - public abstract Type chooseType(XmlTag tag); - public abstract void distinguishTag(XmlTag tag, Type aClass) throws IncorrectOperationException; - public abstract Type[] getChooserTypes(); +public class XmlElementFactory { + private XmlElementFactory() { + } + + public static XmlText createXmlTextFromText(PsiManager psiManager, String text) throws IncorrectOperationException { + return com.intellij.psi.XmlElementFactory.getInstance(psiManager.getProject()).createTagFromText("" + text + "").getValue().getTextElements()[0]; + } } diff --git a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java index 46fca5a2a3..badb009d93 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java +++ b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.xml.util; diff --git a/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java b/xml/impl/src/com/intellij/xml/util/XmlIdContributor.java similarity index 62% copy from xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java copy to xml/impl/src/com/intellij/xml/util/XmlIdContributor.java index 7ae4dfa4f3..d4ff3dce33 100644 --- a/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java +++ b/xml/impl/src/com/intellij/xml/util/XmlIdContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -15,6 +15,14 @@ */ package com.intellij.xml.util; -public class XmlTagTextUtil extends XmlTagUtil { +import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.psi.xml.XmlFile; -} \ No newline at end of file +/** + * @author yole + */ +public interface XmlIdContributor { + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.xml.idContributor"); + + boolean suppressExistingIdValidation(XmlFile file); +} diff --git a/xml/impl/src/com/intellij/xml/util/XmlIncludeHandler.java b/xml/impl/src/com/intellij/xml/util/XmlIncludeHandler.java index 0dbb82a8df..68273799cb 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlIncludeHandler.java +++ b/xml/impl/src/com/intellij/xml/util/XmlIncludeHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java b/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java index 872a926082..2c33dca468 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java +++ b/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java b/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java index 220bfef0eb..8244cd5cbd 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java +++ b/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.daemon.impl.analysis.XmlHighlightVisitor; diff --git a/xml/impl/src/com/intellij/xml/util/XmlResourceResolver.java b/xml/impl/src/com/intellij/xml/util/XmlResourceResolver.java index 6e8c1a605c..11fdea2a04 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlResourceResolver.java +++ b/xml/impl/src/com/intellij/xml/util/XmlResourceResolver.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.javaee.ExternalResourceManagerEx; diff --git a/xml/impl/src/com/intellij/xml/util/XmlUtil.java b/xml/impl/src/com/intellij/xml/util/XmlUtil.java index af5aeb76a4..aecc30aa51 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlUtil.java +++ b/xml/impl/src/com/intellij/xml/util/XmlUtil.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util; import com.intellij.codeInsight.completion.CompletionUtil; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/CompositeAttributeTagDescriptor.java b/xml/impl/src/com/intellij/xml/util/documentation/CompositeAttributeTagDescriptor.java index b525d79000..7ebc368ca3 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/CompositeAttributeTagDescriptor.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/CompositeAttributeTagDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import com.intellij.psi.xml.XmlTag; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/EntityDescriptor.java b/xml/impl/src/com/intellij/xml/util/documentation/EntityDescriptor.java index 58e6025429..3170740f61 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/EntityDescriptor.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/EntityDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; /** diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlAttributeDescriptor.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlAttributeDescriptor.java index 0d4656f7e5..67b792fdde 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlAttributeDescriptor.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlAttributeDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import java.util.Arrays; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDescriptorsTable.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDescriptorsTable.java index 6fbc0dd0a9..e52405e78f 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDescriptorsTable.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDescriptorsTable.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import org.jdom.Document; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java index 6900f1c607..d687fa5bbb 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import com.intellij.lang.documentation.DocumentationProvider; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlTagDescriptor.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlTagDescriptor.java index 4d846e5ae5..935ab41a5e 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlTagDescriptor.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlTagDescriptor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; /** diff --git a/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java index a5983f2c79..8ca9fa78ed 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import com.intellij.psi.PsiElement; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java index 1df366373b..19cbc4c2e5 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.xml.util.documentation; import com.intellij.codeInsight.completion.XmlCompletionData; diff --git a/xml/openapi/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java b/xml/openapi/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java index 641d80eccb..298b8dd3fb 100644 --- a/xml/openapi/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java +++ b/xml/openapi/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java b/xml/openapi/src/com/intellij/codeInspection/XmlInspectionGroupNames.java similarity index 63% copy from xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java copy to xml/openapi/src/com/intellij/codeInspection/XmlInspectionGroupNames.java index ee02bfccad..6824f7fcb6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/GenericDomValue.java +++ b/xml/openapi/src/com/intellij/codeInspection/XmlInspectionGroupNames.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,21 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.codeInspection; -import org.jetbrains.annotations.NotNull; +import com.intellij.xml.XmlBundle; /** - * @author peter + * @author Dmitry Avdeev */ -public interface GenericDomValue extends DomElement, MutableGenericValue{ - - @NotNull - Converter getConverter(); - - @TagValue - void setStringValue(String value); - - void setValue(T value); - +public interface XmlInspectionGroupNames { + String HTML_INSPECTIONS = XmlBundle.message("html.inspections.group.name"); + String XML_INSPECTIONS = XmlBundle.message("xml.inspections.group.name"); } diff --git a/xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java b/xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java index a8747078ad..7dfc0def14 100644 --- a/xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java +++ b/xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/codeInspection/XmlSuppressionProvider.java b/xml/openapi/src/com/intellij/codeInspection/XmlSuppressionProvider.java index 4ce4eaaa6f..6ec4803e81 100644 --- a/xml/openapi/src/com/intellij/codeInspection/XmlSuppressionProvider.java +++ b/xml/openapi/src/com/intellij/codeInspection/XmlSuppressionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java index 80b56ff9c1..f29270be9c 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java +++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.openapi.extensions.ExtensionPointName; diff --git a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProviders.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProviders.java index 6ddebfacb7..ddc1c2b825 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProviders.java +++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProviders.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.ide.browsers; import com.intellij.psi.PsiElement; diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewBuilderProvider.java similarity index 60% copy from xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java copy to xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewBuilderProvider.java index ace8c1f21d..8099e2de11 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewBuilderProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.ide.structureView.xml; +import com.intellij.ide.structureView.StructureViewBuilder; +import com.intellij.psi.xml.XmlFile; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface XmlTagChild extends XmlElement{ - XmlTagChild[] EMPTY_ARRAY = new XmlTagChild[0]; - @Nullable - XmlTag getParentTag(); +public interface XmlStructureViewBuilderProvider { + @NonNls String EXTENSION_POINT_NAME = "com.intellij.xmlStructureViewBuilderProvider"; @Nullable - XmlTagChild getNextSiblingInTag(); - @Nullable - XmlTagChild getPrevSiblingInTag(); + StructureViewBuilder createStructureViewBuilder(@NotNull XmlFile file); } diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewElementProvider.java similarity index 58% copy from xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java copy to xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewElementProvider.java index ace8c1f21d..74b0aae296 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/openapi/src/com/intellij/ide/structureView/xml/XmlStructureViewElementProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.ide.structureView.xml; +import com.intellij.ide.structureView.StructureViewTreeElement; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface XmlTagChild extends XmlElement{ - XmlTagChild[] EMPTY_ARRAY = new XmlTagChild[0]; - @Nullable - XmlTag getParentTag(); +/** + * @author peter + */ +public interface XmlStructureViewElementProvider { + @NonNls String EXTENSION_POINT_NAME = "com.intellij.xmlStructureViewElementProvider"; @Nullable - XmlTagChild getNextSiblingInTag(); - @Nullable - XmlTagChild getPrevSiblingInTag(); + StructureViewTreeElement createCustomXmlTagTreeElement(@NotNull XmlTag tag); } diff --git a/xml/openapi/src/com/intellij/javaee/ExternalResourceManager.java b/xml/openapi/src/com/intellij/javaee/ExternalResourceManager.java index 4471f3d412..73f31e3393 100644 --- a/xml/openapi/src/com/intellij/javaee/ExternalResourceManager.java +++ b/xml/openapi/src/com/intellij/javaee/ExternalResourceManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java b/xml/openapi/src/com/intellij/javaee/ResourceRegistrar.java similarity index 55% copy from xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java copy to xml/openapi/src/com/intellij/javaee/ResourceRegistrar.java index 6d5bd04974..35c0be4846 100644 --- a/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java +++ b/xml/openapi/src/com/intellij/javaee/ResourceRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,21 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.tree.xml; -import com.intellij.openapi.fileTypes.StdFileTypes; -import com.intellij.psi.tree.IElementType; +package com.intellij.javaee; + import org.jetbrains.annotations.NonNls; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Sep 9, 2004 - * Time: 8:11:22 PM - * To change this template use File | Settings | File Templates. + * @author Dmitry Avdeev + * @see com.intellij.javaee.StandardResourceProvider */ -public class IDTDElementType extends IElementType{ - public IDTDElementType(@NonNls String debugName) { - super(debugName, StdFileTypes.DTD.getLanguage()); - } +public interface ResourceRegistrar { + + void addStdResource(@NonNls String resource, @NonNls String fileName); + void addStdResource(@NonNls String resource, @NonNls String fileName, Class klass); + void addStdResource(@NonNls String resource, @NonNls String version, @NonNls String fileName, Class klass); + void addIgnoredResource(@NonNls String url); + } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java b/xml/openapi/src/com/intellij/javaee/StandardResourceProvider.java similarity index 60% copy from xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java copy to xml/openapi/src/com/intellij/javaee/StandardResourceProvider.java index bf35ad77a0..f23c3251b0 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AnnotatedElement.java +++ b/xml/openapi/src/com/intellij/javaee/StandardResourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; -import org.jetbrains.annotations.Nullable; +package com.intellij.javaee; -import java.lang.annotation.Annotation; +import com.intellij.openapi.extensions.ExtensionPointName; /** - * @author peter + * @author Dmitry Avdeev */ -public interface AnnotatedElement { +public interface StandardResourceProvider { - @Nullable - T getAnnotation(Class annotationClass); + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.standardResourceProvider"); + + void registerResources(ResourceRegistrar registrar); } diff --git a/xml/openapi/src/com/intellij/javaee/UriUtil.java b/xml/openapi/src/com/intellij/javaee/UriUtil.java index babf7a632e..1e11b9dfed 100644 --- a/xml/openapi/src/com/intellij/javaee/UriUtil.java +++ b/xml/openapi/src/com/intellij/javaee/UriUtil.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.javaee; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java b/xml/openapi/src/com/intellij/lang/documentation/DocumentationUtil.java similarity index 61% copy from xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java copy to xml/openapi/src/com/intellij/lang/documentation/DocumentationUtil.java index 79b45fea3a..7ba8608cf6 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java +++ b/xml/openapi/src/com/intellij/lang/documentation/DocumentationUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.lang.documentation; /** - * @author peter + * @author Dmitry Avdeev */ -public class ParentScopeProvider extends ScopeProvider{ - public DomElement getScope(DomElement element) { - return element.getParent(); +public class DocumentationUtil { + @SuppressWarnings({"HardCodedStringLiteral"}) + public static void formatEntityName(String type, String name, StringBuilder destination) { + destination.append(type).append(": ").append(name).append("
"); } } diff --git a/xml/openapi/src/com/intellij/psi/xml/XmlToken.java b/xml/openapi/src/com/intellij/lexer/EmbedmentLexer.java similarity index 76% copy from xml/openapi/src/com/intellij/psi/xml/XmlToken.java copy to xml/openapi/src/com/intellij/lexer/EmbedmentLexer.java index 7c0dd64aea..edc952975e 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlToken.java +++ b/xml/openapi/src/com/intellij/lexer/EmbedmentLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.xml; +package com.intellij.lexer; import com.intellij.psi.tree.IElementType; - /** - * @author Mike + * @author Maxim.Mossienko */ -public interface XmlToken extends XmlElement{ - IElementType getTokenType(); +public interface EmbedmentLexer { + int getEmbeddedInitialState(final IElementType tokenType); } diff --git a/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java b/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java index 80d6ec4ffb..3188fd1aa7 100644 --- a/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java +++ b/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.editor; import com.intellij.openapi.editor.colors.TextAttributesKey; diff --git a/xml/openapi/src/com/intellij/patterns/XmlAttributeValuePattern.java b/xml/openapi/src/com/intellij/patterns/XmlAttributeValuePattern.java index daa1f7fdb4..4d3341dba5 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlAttributeValuePattern.java +++ b/xml/openapi/src/com/intellij/patterns/XmlAttributeValuePattern.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/openapi/src/com/intellij/patterns/XmlElementPattern.java b/xml/openapi/src/com/intellij/patterns/XmlElementPattern.java index 489eff7135..2a921406a9 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlElementPattern.java +++ b/xml/openapi/src/com/intellij/patterns/XmlElementPattern.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/openapi/src/com/intellij/patterns/XmlFilePattern.java b/xml/openapi/src/com/intellij/patterns/XmlFilePattern.java index 785ebbfaf4..200fa32387 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlFilePattern.java +++ b/xml/openapi/src/com/intellij/patterns/XmlFilePattern.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.patterns; import com.intellij.psi.xml.XmlDocument; diff --git a/xml/openapi/src/com/intellij/patterns/XmlNamedElementPattern.java b/xml/openapi/src/com/intellij/patterns/XmlNamedElementPattern.java index 90f07215f8..530e798520 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlNamedElementPattern.java +++ b/xml/openapi/src/com/intellij/patterns/XmlNamedElementPattern.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 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.patterns; diff --git a/xml/openapi/src/com/intellij/patterns/XmlPatterns.java b/xml/openapi/src/com/intellij/patterns/XmlPatterns.java index 4fc507414f..a675bc410c 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlPatterns.java +++ b/xml/openapi/src/com/intellij/patterns/XmlPatterns.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * Copyright 2000-2009 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.patterns; diff --git a/xml/openapi/src/com/intellij/patterns/XmlTagPattern.java b/xml/openapi/src/com/intellij/patterns/XmlTagPattern.java index 636c2b840b..5be06fa847 100644 --- a/xml/openapi/src/com/intellij/patterns/XmlTagPattern.java +++ b/xml/openapi/src/com/intellij/patterns/XmlTagPattern.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.patterns; import com.intellij.openapi.util.Comparing; diff --git a/xml/openapi/src/com/intellij/pom/xml/XmlAspect.java b/xml/openapi/src/com/intellij/pom/xml/XmlAspect.java index 43e75151ea..8f75a8ee39 100644 --- a/xml/openapi/src/com/intellij/pom/xml/XmlAspect.java +++ b/xml/openapi/src/com/intellij/pom/xml/XmlAspect.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java b/xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java index 2150676fec..f800661c25 100644 --- a/xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java +++ b/xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitor.java b/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitor.java index 6fb19739ff..30f3b8c8e9 100644 --- a/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitor.java +++ b/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitorBase.java b/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitorBase.java index 3a1958373b..9295e68840 100644 --- a/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitorBase.java +++ b/xml/openapi/src/com/intellij/pom/xml/XmlChangeVisitorBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java index 7fda050dde..657b62af4f 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java index ff28a41d97..4b543124d0 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java index ae0c941436..4892823175 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java index 83353133e1..938f1f77af 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java index adf3cc07f2..2e29619012 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java index 218b215568..b2219eda2d 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java index 31f3237a83..a65e1b3018 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java index 3eddde6260..dd3a5b2325 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java b/xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java index 283dad621b..0b26198dfd 100644 --- a/xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java +++ b/xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/XmlElementFactory.java b/xml/openapi/src/com/intellij/psi/XmlElementFactory.java index 0a563de74e..3e946bc52a 100644 --- a/xml/openapi/src/com/intellij/psi/XmlElementFactory.java +++ b/xml/openapi/src/com/intellij/psi/XmlElementFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi; import com.intellij.lang.Language; diff --git a/xml/openapi/src/com/intellij/psi/XmlElementVisitor.java b/xml/openapi/src/com/intellij/psi/XmlElementVisitor.java index 9125c70570..fe5809b160 100644 --- a/xml/openapi/src/com/intellij/psi/XmlElementVisitor.java +++ b/xml/openapi/src/com/intellij/psi/XmlElementVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/XmlRecursiveElementVisitor.java b/xml/openapi/src/com/intellij/psi/XmlRecursiveElementVisitor.java index 1ff4648231..6c99c53fc4 100644 --- a/xml/openapi/src/com/intellij/psi/XmlRecursiveElementVisitor.java +++ b/xml/openapi/src/com/intellij/psi/XmlRecursiveElementVisitor.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * @author max */ package com.intellij.psi; diff --git a/xml/openapi/src/com/intellij/psi/filters/position/NamespaceFilter.java b/xml/openapi/src/com/intellij/psi/filters/position/NamespaceFilter.java index 0ff8a9261a..7754599d42 100644 --- a/xml/openapi/src/com/intellij/psi/filters/position/NamespaceFilter.java +++ b/xml/openapi/src/com/intellij/psi/filters/position/NamespaceFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2009 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.psi.filters.position; import com.intellij.psi.filters.ElementFilter; diff --git a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java b/xml/openapi/src/com/intellij/psi/html/HtmlTag.java index 279f3433bc..86a7255271 100644 --- a/xml/openapi/src/com/intellij/psi/html/HtmlTag.java +++ b/xml/openapi/src/com/intellij/psi/html/HtmlTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java b/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java index 6d5bd04974..df0427d96b 100644 --- a/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java +++ b/xml/openapi/src/com/intellij/psi/tree/xml/IDTDElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/tree/xml/IXmlElementType.java b/xml/openapi/src/com/intellij/psi/tree/xml/IXmlElementType.java index ab4462a865..eda07dc310 100644 --- a/xml/openapi/src/com/intellij/psi/tree/xml/IXmlElementType.java +++ b/xml/openapi/src/com/intellij/psi/tree/xml/IXmlElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java b/xml/openapi/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java index bebf8f4204..b6e5c63b6f 100644 --- a/xml/openapi/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java +++ b/xml/openapi/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java index bc5f04248f..489af379c1 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlAttlistDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlAttribute.java b/xml/openapi/src/com/intellij/psi/xml/XmlAttribute.java index ddca59a966..0ba6a7ef27 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlAttribute.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlAttributeDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlAttributeDecl.java index a4dab8541c..4854c66c49 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlAttributeDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlAttributeDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlAttributeValue.java b/xml/openapi/src/com/intellij/psi/xml/XmlAttributeValue.java index 3a10298c0e..ea879230c5 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlAttributeValue.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlAttributeValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlComment.java b/xml/openapi/src/com/intellij/psi/xml/XmlComment.java index 53a7da95e6..212ba2cec3 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlComment.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlComment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java b/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java index 01b79aa8e7..5a8eff8176 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlConditionalSection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java index 65824bfabb..3240833509 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlDoctype.java b/xml/openapi/src/com/intellij/psi/xml/XmlDoctype.java index 023d1f9873..f10b039ed8 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlDoctype.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlDoctype.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlDocument.java b/xml/openapi/src/com/intellij/psi/xml/XmlDocument.java index 82ef799c99..bfa49317cf 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlDocument.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlDocument.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlElement.java b/xml/openapi/src/com/intellij/psi/xml/XmlElement.java index d33272c3d6..0debe19376 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlElement.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlElementContentSpec.java b/xml/openapi/src/com/intellij/psi/xml/XmlElementContentSpec.java index 75511bbdf4..764a103ed3 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlElementContentSpec.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlElementContentSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java index 71ea8e4cfc..d18b990b12 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlElementDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlEntityDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlEntityDecl.java index 3841182d16..4beb527609 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlEntityDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlEntityDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlEntityRef.java b/xml/openapi/src/com/intellij/psi/xml/XmlEntityRef.java index f3c2d45195..5388b3e5a6 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlEntityRef.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlEntityRef.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java b/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java index adb16b3bea..38b1dcbdea 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlEnumeratedType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlFile.java b/xml/openapi/src/com/intellij/psi/xml/XmlFile.java index 9e8388aab1..84dcfca3d2 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlFile.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlFileNSInfoProvider.java b/xml/openapi/src/com/intellij/psi/xml/XmlFileNSInfoProvider.java index 0c07576c5f..1076de29ed 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlFileNSInfoProvider.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlFileNSInfoProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlMarkupDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlMarkupDecl.java index 08d8c57f18..8592866f5f 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlMarkupDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlMarkupDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlNotationDecl.java b/xml/openapi/src/com/intellij/psi/xml/XmlNotationDecl.java index b44bfd0742..6ca788c237 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlNotationDecl.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlNotationDecl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlProcessingInstruction.java b/xml/openapi/src/com/intellij/psi/xml/XmlProcessingInstruction.java index c036b9a553..5233fac645 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlProcessingInstruction.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlProcessingInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlProlog.java b/xml/openapi/src/com/intellij/psi/xml/XmlProlog.java index 899aed65c2..e05d380b73 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlProlog.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlProlog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlTag.java b/xml/openapi/src/com/intellij/psi/xml/XmlTag.java index 69c470b032..0ac2569250 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTag.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java b/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java index ace8c1f21d..60c822b92d 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlTagChild.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlTagValue.java b/xml/openapi/src/com/intellij/psi/xml/XmlTagValue.java index c6e7ab3dfb..9e922e58f9 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTagValue.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlTagValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlText.java b/xml/openapi/src/com/intellij/psi/xml/XmlText.java index 1c11f75126..608daedbd3 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlText.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlText.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlToken.java b/xml/openapi/src/com/intellij/psi/xml/XmlToken.java index 7c0dd64aea..202f9d203b 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlToken.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlToken.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/psi/xml/XmlTokenType.java b/xml/openapi/src/com/intellij/psi/xml/XmlTokenType.java index 9a43f4058f..bb93704a79 100644 --- a/xml/openapi/src/com/intellij/psi/xml/XmlTokenType.java +++ b/xml/openapi/src/com/intellij/psi/xml/XmlTokenType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java b/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java index 9cd054c97f..545028c0d8 100644 --- a/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java +++ b/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlBundle.java b/xml/openapi/src/com/intellij/xml/XmlBundle.java index 8744237ac1..fa058a7d66 100644 --- a/xml/openapi/src/com/intellij/xml/XmlBundle.java +++ b/xml/openapi/src/com/intellij/xml/XmlBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java b/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java index 14dee593b9..982e4c6cc8 100644 --- a/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java +++ b/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java b/xml/openapi/src/com/intellij/xml/XmlElementDescriptorAwareAboutChildren.java similarity index 75% copy from xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java copy to xml/openapi/src/com/intellij/xml/XmlElementDescriptorAwareAboutChildren.java index b1dba64f5d..412a4b7e30 100644 --- a/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java +++ b/xml/openapi/src/com/intellij/xml/XmlElementDescriptorAwareAboutChildren.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -16,8 +16,7 @@ package com.intellij.xml; import com.intellij.psi.xml.XmlTag; -import org.jetbrains.annotations.NotNull; -public interface XmlElementDescriptorWithCDataContent { - boolean requiresCdataBracesInContext(@NotNull XmlTag context); +public interface XmlElementDescriptorAwareAboutChildren { + boolean allowElementsFromNamespace(final String namespace, final XmlTag context); } \ No newline at end of file diff --git a/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java b/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java index b1dba64f5d..e25fad9a66 100644 --- a/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java +++ b/xml/openapi/src/com/intellij/xml/XmlElementDescriptorWithCDataContent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlNSDescriptor.java b/xml/openapi/src/com/intellij/xml/XmlNSDescriptor.java index 181bef042e..43228719cd 100644 --- a/xml/openapi/src/com/intellij/xml/XmlNSDescriptor.java +++ b/xml/openapi/src/com/intellij/xml/XmlNSDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java b/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java index 83ccb35cfd..a9c8a471cf 100644 --- a/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java +++ b/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java index be3662e579..9ddf887513 100644 --- a/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java +++ b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java @@ -1,4 +1,20 @@ /* + * Copyright 2000-2009 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. + */ + +/* * Created by IntelliJ IDEA. * User: spleaner * Date: Jun 19, 2007 diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItem.java similarity index 71% copy from xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java copy to xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItem.java index 79b45fea3a..1f71688b94 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ParentScopeProvider.java +++ b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,13 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.xml.breadcrumbs; /** - * @author peter + * @author spleaner */ -public class ParentScopeProvider extends ScopeProvider{ - public DomElement getScope(DomElement element) { - return element.getParent(); +public abstract class BreadcrumbsItem { + + public abstract String getDisplayText(); + + public String getTooltip() { + return ""; } + } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItemListener.java similarity index 71% copy from xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java copy to xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItemListener.java index 9d144e8126..0b74d342de 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/RootScopeProvider.java +++ b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsItemListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.xml; +package com.intellij.xml.breadcrumbs; import org.jetbrains.annotations.NotNull; /** - * @author peter + * @author spleaner */ -public class RootScopeProvider extends ScopeProvider{ +public interface BreadcrumbsItemListener { + + void itemSelected(@NotNull final T item, final int modifiers); - public DomElement getScope(@NotNull DomElement element) { - return DomUtil.getRoot(element); - } } diff --git a/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java b/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java index 7ae4dfa4f3..2124701a51 100644 --- a/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java +++ b/xml/openapi/src/com/intellij/xml/util/XmlTagTextUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java b/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java index 4f6524f07c..243cc03d4f 100644 --- a/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java +++ b/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * Copyright 2000-2009 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. -- 2.11.4.GIT