From 782efe94156eb8c5fe947ba13df40559c2d95c36 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Sat, 26 May 2018 11:20:31 +0300
Subject: [PATCH] util: prepare to update to JDOM 2.0 (IDEA-192733)

Some methods in Content's inheritors use covariant return types in JDOM 2.0 so we need to update our implementations.
---
 platform/util/src/org/jdom/ImmutableCDATA.java   | 8 ++++----
 platform/util/src/org/jdom/ImmutableElement.java | 2 +-
 platform/util/src/org/jdom/ImmutableText.java    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/util/src/org/jdom/ImmutableCDATA.java b/platform/util/src/org/jdom/ImmutableCDATA.java
index 2060675b59d8..686224f1a78c 100644
--- a/platform/util/src/org/jdom/ImmutableCDATA.java
+++ b/platform/util/src/org/jdom/ImmutableCDATA.java
@@ -22,7 +22,7 @@ public class ImmutableCDATA extends CDATA {
 
   @SuppressWarnings("MethodDoesntCallSuperMethod")
   @Override
-  public Text clone() {
+  public CDATA clone() {
     CDATA text = new CDATA();
     text.value = value;
     return text;
@@ -35,7 +35,7 @@ public class ImmutableCDATA extends CDATA {
 
   //////////////////////////////////////////////////////////////////////////
   @Override
-  public Text setText(String str) {
+  public CDATA setText(String str) {
     throw ImmutableElement.immutableError(this);
   }
 
@@ -50,12 +50,12 @@ public class ImmutableCDATA extends CDATA {
   }
 
   @Override
-  public Content detach() {
+  public CDATA detach() {
     throw ImmutableElement.immutableError(this);
   }
 
   @Override
-  protected Content setParent(Parent parent) {
+  protected CDATA setParent(Parent parent) {
     throw ImmutableElement.immutableError(this);
     //return null; // to be able to add this to the other element
   }
diff --git a/platform/util/src/org/jdom/ImmutableElement.java b/platform/util/src/org/jdom/ImmutableElement.java
index 526f0c4986f2..8019d12cb7c5 100644
--- a/platform/util/src/org/jdom/ImmutableElement.java
+++ b/platform/util/src/org/jdom/ImmutableElement.java
@@ -304,7 +304,7 @@ class ImmutableElement extends Element {
 
   //////////////////////////////////////////////////////////////////////
   @Override
-  public Content detach() {
+  public Element detach() {
     throw immutableError(this);
   }
   @Override
diff --git a/platform/util/src/org/jdom/ImmutableText.java b/platform/util/src/org/jdom/ImmutableText.java
index fdedbb534919..629a43ee5572 100644
--- a/platform/util/src/org/jdom/ImmutableText.java
+++ b/platform/util/src/org/jdom/ImmutableText.java
@@ -50,12 +50,12 @@ public class ImmutableText extends Text {
   }
 
   @Override
-  public Content detach() {
+  public Text detach() {
     throw ImmutableElement.immutableError(this);
   }
 
   @Override
-  protected Content setParent(Parent parent) {
+  protected Text setParent(Parent parent) {
     throw ImmutableElement.immutableError(this);
     //return null; // to be able to add this to the other element
   }