diff --git a/.idea/modules.xml b/.idea/modules.xml index 756f65a7ae81..064010d8399b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -230,7 +230,6 @@ - diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index 274c34253a24..8ff6a2be8a59 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -379,7 +379,6 @@ binding.setVariable("platformApiModules", [ "projectModel-api", "remote-servers-agent-rt", "remote-servers-api", - "structure-view-api", "usageView", "vcs-api-core", "vcs-api", @@ -1255,7 +1254,6 @@ binding.setVariable("analysisApiModules", [ "jps-model-api", "jps-model-serialization", "projectModel-api", - "structure-view-api", "util", "util-rt", "xml-analysis-api", diff --git a/platform/editor-ui-api/editor-ui-api.iml b/platform/editor-ui-api/editor-ui-api.iml index d45353c10fc4..e68f375a0fd6 100644 --- a/platform/editor-ui-api/editor-ui-api.iml +++ b/platform/editor-ui-api/editor-ui-api.iml @@ -12,8 +12,5 @@ - - - - + \ No newline at end of file diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/BackgroundEditorHighlighter.java b/platform/editor-ui-api/src/com/intellij/codeHighlighting/BackgroundEditorHighlighter.java similarity index 100% rename from platform/analysis-api/src/com/intellij/codeHighlighting/BackgroundEditorHighlighter.java rename to platform/editor-ui-api/src/com/intellij/codeHighlighting/BackgroundEditorHighlighter.java diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightingPass.java b/platform/editor-ui-api/src/com/intellij/codeHighlighting/HighlightingPass.java similarity index 97% rename from platform/analysis-api/src/com/intellij/codeHighlighting/HighlightingPass.java rename to platform/editor-ui-api/src/com/intellij/codeHighlighting/HighlightingPass.java index 0cfcd95ebd3b..44b3e1b23d39 100644 --- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightingPass.java +++ b/platform/editor-ui-api/src/com/intellij/codeHighlighting/HighlightingPass.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/projectView/PresentationData.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java similarity index 100% rename from platform/structure-view-api/src/com/intellij/ide/projectView/PresentationData.java rename to platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java diff --git a/platform/structure-view-api/src/com/intellij/ide/projectView/RootsProvider.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/RootsProvider.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/projectView/RootsProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/projectView/RootsProvider.java index dc12d1056d7f..8e5bdf1e10f7 100644 --- a/platform/structure-view-api/src/com/intellij/ide/projectView/RootsProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/RootsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/projectView/SettingsProvider.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/SettingsProvider.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/ide/projectView/SettingsProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/projectView/SettingsProvider.java index e7163ba361c1..d5d4e975b5d9 100644 --- a/platform/structure-view-api/src/com/intellij/ide/projectView/SettingsProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/SettingsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/projectView/TreeStructureProvider.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/projectView/TreeStructureProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java index 315a41ec6a81..f70742891b5c 100644 --- a/platform/structure-view-api/src/com/intellij/ide/projectView/TreeStructureProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/projectView/ViewSettings.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/ViewSettings.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/projectView/ViewSettings.java rename to platform/editor-ui-api/src/com/intellij/ide/projectView/ViewSettings.java index 4229fcf47440..79798c706635 100644 --- a/platform/structure-view-api/src/com/intellij/ide/projectView/ViewSettings.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/ViewSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java index ad7a2ce32239..28f447018479 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/FileEditorPositionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/ModelListener.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/ModelListener.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/structureView/ModelListener.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/ModelListener.java index 3ec8c284c6ca..cc88d71f3ed6 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/ModelListener.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/ModelListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureView.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureView.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureView.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureView.java index 604fa00b2841..5d237e3b099e 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureView.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilder.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilder.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilder.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilder.java index ceaab48de15b..d64eed56ecfd 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilder.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java index 5d70e3d95c7d..9ac5154b215f 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilderProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewFactory.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewFactory.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewFactory.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewFactory.java index 1d2bf73f10f7..dc468ba98232 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewFactory.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModel.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModel.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModel.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModel.java index 551d70d055e1..fd8e98787681 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModel.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModelBase.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModelBase.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModelBase.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModelBase.java index ac191b813ffd..00b8a39d3ac5 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewModelBase.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewModelBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java index 1b666467585e..11adeb21eec3 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewTreeElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java similarity index 99% rename from platform/structure-view-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java index 04d23e34824a..d49733cb0012 100644 --- a/platform/structure-view-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java +++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java similarity index 100% rename from platform/structure-view-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java rename to platform/editor-ui-api/src/com/intellij/ide/structureView/TreeBasedStructureViewBuilder.java diff --git a/platform/structure-view-api/src/com/intellij/ide/structureView/package.html b/platform/editor-ui-api/src/com/intellij/ide/structureView/package.html similarity index 100% rename from platform/structure-view-api/src/com/intellij/ide/structureView/package.html rename to platform/editor-ui-api/src/com/intellij/ide/structureView/package.html diff --git a/platform/structure-view-api/src/com/intellij/ide/util/ActionShortcutProvider.java b/platform/editor-ui-api/src/com/intellij/ide/util/ActionShortcutProvider.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/util/ActionShortcutProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/util/ActionShortcutProvider.java index 26c5c9388373..5ae5f8f4ace0 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/ActionShortcutProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/ActionShortcutProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/FileStructureFilter.java b/platform/editor-ui-api/src/com/intellij/ide/util/FileStructureFilter.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/util/FileStructureFilter.java rename to platform/editor-ui-api/src/com/intellij/ide/util/FileStructureFilter.java index f8fa7a877f40..b33b389bd881 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/FileStructureFilter.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/FileStructureFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/FileStructureNodeProvider.java b/platform/editor-ui-api/src/com/intellij/ide/util/FileStructureNodeProvider.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/util/FileStructureNodeProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/util/FileStructureNodeProvider.java index 2bf37e2635c1..7b89f17142e7 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/FileStructureNodeProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/FileStructureNodeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java similarity index 99% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java index ada9c64047e6..cbd4434cbc93 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java similarity index 99% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java index 2ef543ea28ab..2a014b6fa6e6 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeStructure.java @@ -75,4 +75,4 @@ public abstract class AbstractTreeStructure { public AsyncResult revalidateElement(Object element) { return AsyncResult.done(element); } -} \ No newline at end of file +} diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AlphaComparator.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AlphaComparator.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/AlphaComparator.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/AlphaComparator.java index c97bfe5c9296..b87c3b69555d 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/AlphaComparator.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AlphaComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/IndexComparator.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/IndexComparator.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/IndexComparator.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/IndexComparator.java index 662b358aeea6..ebc3c6a8ac54 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/IndexComparator.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/IndexComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java similarity index 99% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java index b49d89bea205..72c61abcef3e 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java index 2bca0fc31b84..f1a6fc1675a3 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeDescriptorProvidingKey.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeOptions.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeOptions.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeOptions.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeOptions.java index 324f1a58009c..0438e8f83ff0 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/NodeOptions.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/NodeOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java similarity index 99% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java index 1850778d706b..114d634ee212 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java index 4f8549a90a21..9105915397bc 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java index 489ed83ee0e5..19069ea5d82d 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeUpdatePass.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeVisitor.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeVisitor.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeVisitor.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeVisitor.java index 211abb1b5c72..a5eafbc9e724 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeVisitor.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/ValidateableNode.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/ValidateableNode.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/ValidateableNode.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/ValidateableNode.java index f8f3c3d6fddf..c373b21fc44d 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/ValidateableNode.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/ValidateableNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/WeighedItem.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/WeighedItem.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/WeighedItem.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/WeighedItem.java index edbe752d3208..ff8f3004bff3 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/WeighedItem.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/WeighedItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java index 8ba47d5b32e1..130dc9b0c3cb 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java index 1a85799128cc..7345ff69fd2b 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ActionPresentationData.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java index 3cd07474612f..c033902d51f5 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Filter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Group.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Group.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Group.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Group.java index 9623cf6a5c4e..d5ea8b3240c0 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Group.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Group.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java index 9c36f0c5f867..7e5870cd07e6 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Grouper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java index ea97b85b78b0..95f9b5731017 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/NodeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java index cd2f7a0df243..521b27560e62 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/ProvidingTreeModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java similarity index 95% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java index 6ec0f5484b57..892510f98f96 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SortableTreeElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java similarity index 98% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java index cd0f2dbf6516..49589f850b35 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java index cabcc7a7ac0d..05f537fda810 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/SorterUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java index 82b907195b04..64a8dbddb40a 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java index 407c4437e57b..02e26ecf446f 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java index 675c7041cd3e..6f3b98b9608e 100644 --- a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/TreeModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/package.html b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/package.html similarity index 100% rename from platform/structure-view-api/src/com/intellij/ide/util/treeView/smartTree/package.html rename to platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/package.html diff --git a/platform/structure-view-api/src/com/intellij/lang/LanguageStructureViewBuilder.java b/platform/editor-ui-api/src/com/intellij/lang/LanguageStructureViewBuilder.java similarity index 97% rename from platform/structure-view-api/src/com/intellij/lang/LanguageStructureViewBuilder.java rename to platform/editor-ui-api/src/com/intellij/lang/LanguageStructureViewBuilder.java index e2e4ac1e17a3..83a08062319e 100644 --- a/platform/structure-view-api/src/com/intellij/lang/LanguageStructureViewBuilder.java +++ b/platform/editor-ui-api/src/com/intellij/lang/LanguageStructureViewBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/lang/PsiStructureViewFactory.java b/platform/editor-ui-api/src/com/intellij/lang/PsiStructureViewFactory.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/lang/PsiStructureViewFactory.java rename to platform/editor-ui-api/src/com/intellij/lang/PsiStructureViewFactory.java index afe96269e775..34c9acffd268 100644 --- a/platform/structure-view-api/src/com/intellij/lang/PsiStructureViewFactory.java +++ b/platform/editor-ui-api/src/com/intellij/lang/PsiStructureViewFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/navigation/AnonymousElementProvider.java b/platform/editor-ui-api/src/com/intellij/navigation/AnonymousElementProvider.java similarity index 96% rename from platform/structure-view-api/src/com/intellij/navigation/AnonymousElementProvider.java rename to platform/editor-ui-api/src/com/intellij/navigation/AnonymousElementProvider.java index f7369ca57278..e975ee8de5a9 100644 --- a/platform/structure-view-api/src/com/intellij/navigation/AnonymousElementProvider.java +++ b/platform/editor-ui-api/src/com/intellij/navigation/AnonymousElementProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/structure-view-api/src/com/intellij/openapi/util/PropertyOwner.java b/platform/editor-ui-api/src/com/intellij/openapi/util/PropertyOwner.java similarity index 94% rename from platform/structure-view-api/src/com/intellij/openapi/util/PropertyOwner.java rename to platform/editor-ui-api/src/com/intellij/openapi/util/PropertyOwner.java index c344f15a4e23..7e257fe0e741 100644 --- a/platform/structure-view-api/src/com/intellij/openapi/util/PropertyOwner.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/util/PropertyOwner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/platform-api/platform-api.iml b/platform/platform-api/platform-api.iml index 38016f147d1a..2455e9f385cc 100644 --- a/platform/platform-api/platform-api.iml +++ b/platform/platform-api/platform-api.iml @@ -35,8 +35,6 @@ - - - + \ No newline at end of file diff --git a/platform/structure-view-impl/structure-view-impl.iml b/platform/structure-view-impl/structure-view-impl.iml index 35a80b95dec3..5c0901a57f12 100644 --- a/platform/structure-view-impl/structure-view-impl.iml +++ b/platform/structure-view-impl/structure-view-impl.iml @@ -7,7 +7,24 @@ - + + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/xml/xml-structure-view-api/xml-structure-view-api.iml b/xml/xml-structure-view-api/xml-structure-view-api.iml index 15af705d61aa..fe815762e1d0 100644 --- a/xml/xml-structure-view-api/xml-structure-view-api.iml +++ b/xml/xml-structure-view-api/xml-structure-view-api.iml @@ -9,7 +9,6 @@ - + - - + \ No newline at end of file