mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-04-19 13:02:30 +07:00
[util] export unique package from platform.util.xmlDom module
GitOrigin-RevId: d3c5bb2eb2efda2d6e6553367fa85aae3b85b84a
This commit is contained in:
committed by
intellij-monorepo-bot
parent
45a3d3fd64
commit
40db2a95c7
@@ -12,7 +12,7 @@ import com.intellij.util.diff.Diff
|
||||
import com.intellij.util.io.directoryStreamIfExists
|
||||
import com.intellij.util.io.systemIndependentPath
|
||||
import com.intellij.util.lang.Murmur3_32Hash
|
||||
import com.intellij.util.readXmlAsModel
|
||||
import com.intellij.util.xml.dom.readXmlAsModel
|
||||
import org.jetbrains.jps.model.JpsSimpleElement
|
||||
import org.jetbrains.jps.model.java.JavaResourceRootType
|
||||
import org.jetbrains.jps.model.java.JavaSourceRootProperties
|
||||
|
||||
@@ -3,8 +3,8 @@ package com.intellij.openapi.application;
|
||||
|
||||
import com.intellij.openapi.util.NlsSafe;
|
||||
import com.intellij.util.PlatformUtils;
|
||||
import com.intellij.util.XmlDomReader;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlDomReader;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.ide.plugins
|
||||
|
||||
import com.intellij.openapi.diagnostic.Logger
|
||||
import com.intellij.openapi.extensions.PluginId
|
||||
import com.intellij.util.XmlInterner
|
||||
import com.intellij.util.xml.dom.XmlInterner
|
||||
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
|
||||
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@@ -4,7 +4,7 @@ package com.intellij.ide.plugins
|
||||
import com.intellij.openapi.extensions.ExtensionDescriptor
|
||||
import com.intellij.openapi.extensions.PluginId
|
||||
import com.intellij.openapi.util.NlsSafe
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
import java.time.LocalDate
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ import com.intellij.openapi.extensions.ExtensionPointDescriptor
|
||||
import com.intellij.openapi.extensions.LoadingOrder
|
||||
import com.intellij.openapi.extensions.PluginId
|
||||
import com.intellij.openapi.util.createNonCoalescingXmlStreamReader
|
||||
import com.intellij.util.NoOpXmlInterner
|
||||
import com.intellij.util.XmlInterner
|
||||
import com.intellij.util.xml.dom.NoOpXmlInterner
|
||||
import com.intellij.util.xml.dom.XmlInterner
|
||||
import com.intellij.util.lang.ZipFilePool
|
||||
import com.intellij.util.messages.ListenerDescriptor
|
||||
import com.intellij.util.readXmlAsModel
|
||||
import com.intellij.util.xml.dom.readXmlAsModel
|
||||
import org.codehaus.stax2.XMLStreamReader2
|
||||
import org.codehaus.stax2.typed.TypedXMLStreamException
|
||||
import org.jetbrains.annotations.TestOnly
|
||||
|
||||
@@ -15,7 +15,7 @@ import com.intellij.openapi.extensions.PluginId;
|
||||
import com.intellij.openapi.util.BuildNumber;
|
||||
import com.intellij.openapi.util.NlsSafe;
|
||||
import com.intellij.serviceContainer.NonInjectable;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package com.intellij.openapi.application.impl
|
||||
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
|
||||
data class ZenDeskField(val id: Long, val type: String?, val value: String?) {
|
||||
companion object {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.openapi.extensions
|
||||
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@ApiStatus.Internal
|
||||
|
||||
@@ -4,7 +4,7 @@ package com.intellij.openapi.extensions.impl
|
||||
import com.intellij.openapi.components.ComponentManager
|
||||
import com.intellij.openapi.extensions.*
|
||||
import com.intellij.openapi.progress.ProcessCanceledException
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
import com.intellij.util.xmlb.XmlSerializer
|
||||
import java.util.*
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ import com.intellij.openapi.util.text.HtmlBuilder
|
||||
import com.intellij.openapi.util.text.HtmlChunk
|
||||
import com.intellij.ui.HyperlinkLabel
|
||||
import com.intellij.util.PlatformUtils
|
||||
import com.intellij.util.readXmlAsModel
|
||||
import com.intellij.util.xml.dom.readXmlAsModel
|
||||
import com.intellij.util.ui.JBUI
|
||||
import com.intellij.util.ui.UIUtil
|
||||
import java.awt.Dimension
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.serialization.xml
|
||||
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
import com.intellij.util.xmlb.NotNullDeserializeBinding
|
||||
import com.intellij.util.xmlb.SerializationFilter
|
||||
import kotlinx.serialization.ExperimentalSerializationApi
|
||||
|
||||
@@ -52,7 +52,7 @@ import com.intellij.ui.icons.IconLoadMeasurer;
|
||||
import com.intellij.util.ArrayUtilRt;
|
||||
import com.intellij.util.DefaultBundleService;
|
||||
import com.intellij.util.ReflectionUtil;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.containers.CollectionFactory;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import com.intellij.util.containers.MultiMap;
|
||||
|
||||
@@ -10,7 +10,7 @@ import com.intellij.testFramework.PlatformTestUtil
|
||||
import com.intellij.testFramework.UsefulTestCase
|
||||
import com.intellij.testFramework.assertions.Assertions.assertThat
|
||||
import com.intellij.testFramework.rules.InMemoryFsRule
|
||||
import com.intellij.util.NoOpXmlInterner
|
||||
import com.intellij.util.xml.dom.NoOpXmlInterner
|
||||
import com.intellij.util.io.directoryContent
|
||||
import com.intellij.util.io.directoryStreamIfExists
|
||||
import com.intellij.util.io.write
|
||||
|
||||
@@ -11,8 +11,8 @@ import com.intellij.openapi.util.text.Strings;
|
||||
import com.intellij.testFramework.PlatformTestUtil;
|
||||
import com.intellij.testFramework.UsefulTestCase;
|
||||
import com.intellij.testFramework.rules.TempDirectory;
|
||||
import com.intellij.util.XmlDomReader;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlDomReader;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.easymock.EasyMock;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -4,11 +4,11 @@ package com.intellij.ide.plugins
|
||||
import com.fasterxml.jackson.core.JsonFactory
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.intellij.openapi.application.PathManager.getHomePath
|
||||
import com.intellij.util.XmlElement
|
||||
import com.intellij.util.xml.dom.XmlElement
|
||||
import com.intellij.util.getErrorsAsString
|
||||
import com.intellij.util.io.jackson.array
|
||||
import com.intellij.util.io.jackson.obj
|
||||
import com.intellij.util.readXmlAsModel
|
||||
import com.intellij.util.xml.dom.readXmlAsModel
|
||||
import java.io.StringWriter
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.NoSuchFileException
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package com.intellij.openapi.application.impl;
|
||||
|
||||
import com.intellij.testFramework.PlatformTestUtil;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.openapi.application;
|
||||
|
||||
import com.intellij.openapi.util.text.Strings;
|
||||
import com.intellij.psi.codeStyle.MinusculeMatcher;
|
||||
import com.intellij.util.XmlDomReader;
|
||||
import com.intellij.util.xml.dom.XmlDomReader;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.xxh3.Xx3UnencodedString;
|
||||
|
||||
@@ -7,7 +7,7 @@ import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.SmartList;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import com.intellij.util.xmlb.annotations.AbstractCollection;
|
||||
import com.intellij.util.xmlb.annotations.XCollection;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.openapi.util.text.StringUtilRt;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.Property;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.Attribute;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -4,7 +4,7 @@ package com.intellij.util.xmlb;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.ReflectionUtil;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -7,7 +7,7 @@ import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.serialization.PropertyCollector;
|
||||
import com.intellij.util.ReflectionUtil;
|
||||
import com.intellij.util.ThreeState;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.AbstractCollection;
|
||||
import com.intellij.util.xmlb.annotations.*;
|
||||
import it.unimi.dsi.fastutil.objects.Object2FloatMap;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Content;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.openapi.util.JDOMUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.Tag;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -7,7 +7,7 @@ import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.ReflectionUtil;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.MapAnnotation;
|
||||
import com.intellij.util.xmlb.annotations.XMap;
|
||||
import org.jdom.Attribute;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -5,7 +5,7 @@ import com.intellij.openapi.util.JDOMUtil;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.OptionTag;
|
||||
import org.jdom.Attribute;
|
||||
import org.jdom.Element;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import com.intellij.util.xmlb.annotations.Tag;
|
||||
import org.jdom.Element;
|
||||
import org.jdom.Text;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.util.xmlb;
|
||||
|
||||
import com.intellij.serialization.ClassUtil;
|
||||
import com.intellij.serialization.MutableAccessor;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jdom.Element;
|
||||
import org.jdom.Text;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package com.intellij.util
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.util.xml.dom
|
||||
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
@file:JvmName("XmlDomReader")
|
||||
@file:ApiStatus.Internal
|
||||
package com.intellij.util
|
||||
package com.intellij.util.xml.dom
|
||||
|
||||
import com.fasterxml.aalto.WFCException
|
||||
import com.fasterxml.aalto.impl.ErrorConsts
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.jetbrains.plugins.textmate.plist;
|
||||
|
||||
import com.intellij.openapi.util.text.Strings;
|
||||
import com.intellij.util.XmlDomReader;
|
||||
import com.intellij.util.XmlElement;
|
||||
import com.intellij.util.xml.dom.XmlDomReader;
|
||||
import com.intellij.util.xml.dom.XmlElement;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.intellij.util.*;
|
||||
import com.intellij.util.ui.JBUI;
|
||||
import com.intellij.util.ui.UIUtil;
|
||||
import com.intellij.util.ui.UIUtilities;
|
||||
import com.intellij.util.xml.dom.XmlDomReader;
|
||||
import com.sun.tools.javac.Main;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.objects.Object2LongMap;
|
||||
|
||||
Reference in New Issue
Block a user