From 0ccbec4a32576c2c3efffa9baed0d2e464564025 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 31 May 2016 18:20:37 +0300
Subject: [PATCH] picocontainer-related classes moved from 'util' to
 'extensions' module to remove dependency on picocontainer.jar

---
 build/scripts/layouts.gant                                     | 1 -
 .../src/com/intellij/openapi/extensions/AreaPicoContainer.java | 0
 .../com/intellij/util/pico/AssignableToComponentAdapter.java   | 0
 .../util/pico/ConstructorInjectionComponentAdapter.java        | 0
 .../src/com/intellij/util/pico/DefaultPicoContainer.java       | 3 ++-
 .../util/src/com/intellij/openapi/application/PathManager.java | 2 --
 platform/util/util.iml                                         | 1 -
 7 files changed, 2 insertions(+), 5 deletions(-)
 rename platform/{util => extensions}/src/com/intellij/openapi/extensions/AreaPicoContainer.java (100%)
 rename platform/{util => extensions}/src/com/intellij/util/pico/AssignableToComponentAdapter.java (100%)
 rename platform/{util => extensions}/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java (100%)
 rename platform/{util => extensions}/src/com/intellij/util/pico/DefaultPicoContainer.java (99%)

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 9a9e9d5409c1..3d5ae020bce0 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -952,7 +952,6 @@ def layoutJps(String home, String targetDir, String buildNumber, Closure additio
         include(name: "ecj*.jar")
         include(name: "netty-all-*.jar")
         include(name: "snappy-in-java-*.jar")
-        include(name: "picocontainer.jar")
       }
       fileset(dir: "$home/jps/lib") {
         include(name: "optimizedFileManager.jar")
diff --git a/platform/util/src/com/intellij/openapi/extensions/AreaPicoContainer.java b/platform/extensions/src/com/intellij/openapi/extensions/AreaPicoContainer.java
similarity index 100%
rename from platform/util/src/com/intellij/openapi/extensions/AreaPicoContainer.java
rename to platform/extensions/src/com/intellij/openapi/extensions/AreaPicoContainer.java
diff --git a/platform/util/src/com/intellij/util/pico/AssignableToComponentAdapter.java b/platform/extensions/src/com/intellij/util/pico/AssignableToComponentAdapter.java
similarity index 100%
rename from platform/util/src/com/intellij/util/pico/AssignableToComponentAdapter.java
rename to platform/extensions/src/com/intellij/util/pico/AssignableToComponentAdapter.java
diff --git a/platform/util/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java b/platform/extensions/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java
similarity index 100%
rename from platform/util/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java
rename to platform/extensions/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java
diff --git a/platform/util/src/com/intellij/util/pico/DefaultPicoContainer.java b/platform/extensions/src/com/intellij/util/pico/DefaultPicoContainer.java
similarity index 99%
rename from platform/util/src/com/intellij/util/pico/DefaultPicoContainer.java
rename to platform/extensions/src/com/intellij/util/pico/DefaultPicoContainer.java
index f569c2060090..0624371db0ac 100644
--- a/platform/util/src/com/intellij/util/pico/DefaultPicoContainer.java
+++ b/platform/extensions/src/com/intellij/util/pico/DefaultPicoContainer.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.
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.picocontainer.*;
 import org.picocontainer.defaults.*;
+import org.picocontainer.defaults.ConstructorInjectionComponentAdapter;
 
 import java.io.Serializable;
 import java.util.*;
diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
index f76b29a37d5b..ea69e529f687 100644
--- a/platform/util/src/com/intellij/openapi/application/PathManager.java
+++ b/platform/util/src/com/intellij/openapi/application/PathManager.java
@@ -33,7 +33,6 @@ import org.jdom.Document;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.picocontainer.PicoContainer;
 
 import java.io.*;
 import java.net.URL;
@@ -455,7 +454,6 @@ public class PathManager {
       Document.class,               // jDOM
       Appender.class,               // log4j
       THashSet.class,               // trove4j
-      PicoContainer.class,          // PicoContainer
       TypeMapper.class,             // JNA
       FileUtils.class,              // JNA (jna-platform)
       PatternMatcher.class,          // OROMatcher
diff --git a/platform/util/util.iml b/platform/util/util.iml
index 6a9a8e8049f5..e5314d8d8076 100644
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -15,7 +15,6 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
-    <orderEntry type="library" name="picocontainer" level="project" />
     <orderEntry type="module" module-name="platform-resources-en" />
     <orderEntry type="module" module-name="annotations" exported="" />
     <orderEntry type="module" module-name="util-rt" exported="" />