From 756e7d697ce222ec26f1ab2adfdf9e802ce18aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Fri, 11 Nov 2016 17:23:09 +0100
Subject: [PATCH] IDEA-163863 Devkit: mark deprecated attributes in DOM

---
 plugins/devkit/src/dom/Extensions.java  |  7 ++++++-
 plugins/devkit/src/dom/IdeaPlugin.java  | 11 ++++++++++-
 plugins/devkit/src/dom/IdeaVersion.java | 10 ++++++++++
 plugins/devkit/src/dom/Vendor.java      | 16 ++++------------
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/plugins/devkit/src/dom/Extensions.java b/plugins/devkit/src/dom/Extensions.java
index 89325190eb68..76c4a0c93361 100644
--- a/plugins/devkit/src/dom/Extensions.java
+++ b/plugins/devkit/src/dom/Extensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,14 @@ public interface Extensions extends DomElement {
   @Stubbed
   GenericAttributeValue<IdeaPlugin> getDefaultExtensionNs();
 
+  /**
+   * @deprecated use {@link #getDefaultExtensionNs()}
+   */
+  @SuppressWarnings("DeprecatedIsStillUsed")
   @NotNull
   @Convert(value = ExtensionNsConverter.class, soft = true)
   @Stubbed
+  @Deprecated
   GenericAttributeValue<IdeaPlugin> getXmlns();
 
   List<Extension> getExtensions();
diff --git a/plugins/devkit/src/dom/IdeaPlugin.java b/plugins/devkit/src/dom/IdeaPlugin.java
index b872fb57af56..3da0c73df278 100644
--- a/plugins/devkit/src/dom/IdeaPlugin.java
+++ b/plugins/devkit/src/dom/IdeaPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,8 +41,13 @@ public interface IdeaPlugin extends DomElement {
   @Stubbed
   GenericDomValue<String> getId();
 
+  /**
+   * @deprecated Unused.
+   */
+  @SuppressWarnings("DeprecatedIsStillUsed")
   @NotNull
   @Attribute("version")
+  @Deprecated
   GenericAttributeValue<Integer> getIdeaPluginVersion();
 
   @NotNull
@@ -88,6 +93,7 @@ public interface IdeaPlugin extends DomElement {
   @Stubbed
   @SubTagList("depends")
   List<Dependency> getDependencies();
+
   @SubTagList("depends")
   Dependency addDependency();
 
@@ -100,12 +106,14 @@ public interface IdeaPlugin extends DomElement {
   @SubTagList("extensions")
   @Stubbed
   List<Extensions> getExtensions();
+
   Extensions addExtensions();
 
   @NotNull
   @Stubbed
   @SubTagList("extensionPoints")
   List<ExtensionPoints> getExtensionPoints();
+
   ExtensionPoints addExtensionPoints();
 
 
@@ -132,6 +140,7 @@ public interface IdeaPlugin extends DomElement {
   @SubTagList("actions")
   @Stubbed
   List<Actions> getActions();
+
   Actions addActions();
 
 
diff --git a/plugins/devkit/src/dom/IdeaVersion.java b/plugins/devkit/src/dom/IdeaVersion.java
index 88ca04a03c7f..149df8b3b2ca 100644
--- a/plugins/devkit/src/dom/IdeaVersion.java
+++ b/plugins/devkit/src/dom/IdeaVersion.java
@@ -25,7 +25,12 @@ import com.intellij.util.xml.Required;
 import org.jetbrains.annotations.NotNull;
 
 public interface IdeaVersion extends DomElement {
+	/**
+	 * @deprecated Use {@link #getUntilBuild()}
+	 */
+	@SuppressWarnings("DeprecatedIsStillUsed")
 	@NotNull
+	@Deprecated
 	GenericAttributeValue<String> getMax();
 
 	@NotNull
@@ -36,6 +41,11 @@ public interface IdeaVersion extends DomElement {
 	GenericAttributeValue<String> getUntilBuild();
 
 
+	/**
+	 * @deprecated Use {@link #getSinceBuild()}
+	 */
+	@SuppressWarnings("DeprecatedIsStillUsed")
 	@NotNull
+	@Deprecated
 	GenericAttributeValue<String> getMin();
 }
diff --git a/plugins/devkit/src/dom/Vendor.java b/plugins/devkit/src/dom/Vendor.java
index 2b152cd423f9..4c06ce56e74f 100644
--- a/plugins/devkit/src/dom/Vendor.java
+++ b/plugins/devkit/src/dom/Vendor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,6 @@ import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.GenericAttributeValue;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * plugin.dtd:vendor interface.
- * Type vendor documentation
- * <pre>
- *     <vendor> tag now could have 'url', 'email' and 'logo' attributes;
- *     'logo' should contain path to a 16 x 16 icon that will appear near the plugin name in the IDEA Welcome Screen 
- * </pre>
- */
 public interface Vendor extends DomElement {
 
 	/**
@@ -69,12 +61,12 @@ public interface Vendor extends DomElement {
 
 
 	/**
-	 * Returns the value of the logo child.
-	 * Attribute logo
-	 * @return the value of the logo child.
+	 * @deprecated not used anymore
 	 */
+	@SuppressWarnings("DeprecatedIsStillUsed")
 	@NotNull
         @NoSpellchecking
+	@Deprecated
 	GenericAttributeValue<String> getLogo();