projectModel-impl extracted, with cyclic/incorrect dependencies for now
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 10 May 2012 15:06:44 +0000 (17:06 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 17 May 2012 11:04:25 +0000 (13:04 +0200)
41 files changed:
platform/projectModel-api/src/com/intellij/openapi/module/ModulePointer.java [moved from platform/lang-api/src/com/intellij/openapi/module/ModulePointer.java with 100% similarity]
platform/projectModel-api/src/com/intellij/openapi/module/ModulePointerManager.java [moved from platform/lang-api/src/com/intellij/openapi/module/ModulePointerManager.java with 100% similarity]
platform/projectModel-api/src/com/intellij/openapi/roots/CompilerModuleExtension.java [moved from platform/lang-api/src/com/intellij/openapi/roots/CompilerModuleExtension.java with 100% similarity]
platform/projectModel-api/src/com/intellij/openapi/roots/ExcludedOutputFolder.java [moved from platform/lang-api/src/com/intellij/openapi/roots/ExcludedOutputFolder.java with 100% similarity]
platform/projectModel-api/src/com/intellij/openapi/roots/ModuleExtension.java [moved from platform/lang-api/src/com/intellij/openapi/roots/ModuleExtension.java with 100% similarity]
platform/projectModel-api/src/com/intellij/openapi/roots/UserDefinedExcludeFolder.java [moved from platform/lang-api/src/com/intellij/openapi/roots/UserDefinedExcludeFolder.java with 100% similarity]
platform/projectModel-impl/projectModel-impl.iml [new file with mode: 0644]
platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java with 97% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumeratorSettings.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/OrderEnumeratorSettings.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ClonableContentEntry.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ClonableContentEntry.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ClonableContentFolder.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ClonableContentFolder.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ClonableOrderEntry.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ClonableOrderEntry.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java with 97% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentFolderBaseImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentFolderBaseImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ExcludeFolderImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ExcludeFolderImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ExcludedOutputFolderImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ExcludedOutputFolderImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java with 98% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryTable.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryTable.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEnumerator.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEnumerator.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleSourceOrderEntryImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleSourceOrderEntryImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModulesOrderEnumerator.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/ModulesOrderEnumerator.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryBaseImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryBaseImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsCache.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderRootsCache.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelComponentBase.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelComponentBase.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java with 99% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/SourceFolderImpl.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/WritableOrderEntry.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/WritableOrderEntry.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryEx.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryEx.java with 100% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java [moved from platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java with 100% similarity]

diff --git a/platform/projectModel-impl/projectModel-impl.iml b/platform/projectModel-impl/projectModel-impl.iml
new file mode 100644 (file)
index 0000000..d2fbf81
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="projectModel-api" exported="" />
+    <orderEntry type="module" module-name="lang-impl" exported="" />
+    <orderEntry type="module" module-name="platform-api" exported="" />
+  </component>
+</module>
+
similarity index 97%
rename from platform/lang-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java
rename to platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java
index f69436a37c954ab20f1a128f02dfed9cb5a01fef..6395b8be0a282e9324e0617cd599173a7b701446 100644 (file)
@@ -18,7 +18,6 @@ package com.intellij.openapi.module.impl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModulePointer;
-import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 /**
similarity index 97%
rename from platform/lang-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
rename to platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
index 27324c76bddc5202735b552254400026bb12227d..144bf1d5742c435ec54af58c88913bcaa39f657b 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
@@ -115,7 +115,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
         result.add(file);
       }
     }
-    return VfsUtil.toVirtualFileArray(result);
+    return VfsUtilCore.toVirtualFileArray(result);
   }
 
   @Override
@@ -155,7 +155,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
         result.add(file);
       }
     }
-    return VfsUtil.toVirtualFileArray(result);
+    return VfsUtilCore.toVirtualFileArray(result);
   }
 
   @Override
@@ -243,8 +243,8 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
   }
 
   private void assertFolderUnderMe(@NotNull String url) {
-    final String path = VfsUtil.urlToPath(url);
-    final String rootPath = VfsUtil.urlToPath(getUrl());
+    final String path = VfsUtilCore.urlToPath(url);
+    final String rootPath = VfsUtilCore.urlToPath(getUrl());
     if (!FileUtil.isAncestor(rootPath, path, false)) {
       LOG.error("The file '" + path + "' is not under content entry root '" + rootPath + "'");
     }
similarity index 98%
rename from platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java
rename to platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java
index 760cab43afe0635cfea430b569d53eb42eec3f55..6b240f49fad477c894bcd8576742d081238c38b8 100644 (file)
@@ -21,7 +21,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.DependencyScope;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.RootProvider;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.NullableFunction;
@@ -100,7 +100,7 @@ abstract class LibraryOrderEntryBaseImpl extends OrderEntryBaseImpl {
         return file.isDirectory() ? file : null;
       }
     });
-    return VfsUtil.toVirtualFileArray(filtered);
+    return VfsUtilCore.toVirtualFileArray(filtered);
   }
 
   @Nullable
similarity index 99%
rename from platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
rename to platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
index abbafde372eb32b07bf764966579a02e87d6e984..7f567119f720da4e82ffa6f59fe60cff98ad3c11 100644 (file)
@@ -36,7 +36,6 @@ import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.HashSet;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;