Cleanup (JRT classes moved to a separate package)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 18:46:44 +0000 (19:46 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 18:47:45 +0000 (19:47 +0100)
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
java/java-impl/src/com/intellij/ide/navigationToolbar/JavaNavBarExtension.java
java/java-impl/src/com/intellij/ide/projectView/impl/JavaProjectViewDirectoryHelper.java
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtFileSystem.java [moved from java/java-impl/src/com/intellij/openapi/vfs/JrtFileSystem.java with 98% similarity]
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandler.java [moved from java/java-impl/src/com/intellij/openapi/vfs/JrtHandler.java with 99% similarity]
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandlerStub.java [moved from java/java-impl/src/com/intellij/openapi/vfs/JrtHandlerStub.java with 96% similarity]
java/java-tests/testSrc/com/intellij/openapi/vfs/JrtFileSystemTest.java
resources/src/META-INF/IdeaPlugin.xml

index 6a8a343203654e7e4917715ab01e56416591c8fb..f31b193fed719b19624bb00de4ec5fb2e7f47fa3 100644 (file)
@@ -23,7 +23,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.ui.SdkPathEditor;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
-import com.intellij.openapi.vfs.JrtFileSystem;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.PlatformIcons;
index 563f5d25ebd587ca330d22d4a7cf8b6bfffa64dd..2a4a555ad05101c921ada5b5fb07cfce20585a61 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.lang.LangBundle;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.vfs.JrtFileSystem;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.presentation.java.ClassPresentationUtil;
index b85bda71ab44167850a7f962a134625fbb2f93a4..c5ad4b06700fd650bc41f3ac7c6e70c17f996a22 100644 (file)
@@ -23,7 +23,7 @@ import com.intellij.ide.util.treeView.TreeViewUtil;
 import com.intellij.lang.LangBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.impl.DirectoryIndex;
-import com.intellij.openapi.vfs.JrtFileSystem;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
index bce0308619e27a1549761f0b036ae36c202af099..dbc4330202a8aef55d32dbe5a26314772ba3bad0 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
similarity index 98%
rename from java/java-impl/src/com/intellij/openapi/vfs/JrtFileSystem.java
rename to java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtFileSystem.java
index 280d5fd4838cef789f0d48466e5cb43e02448b51..f6161f2ad72487e7413d6a6badd5793b1824f469 100644 (file)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vfs;
+package com.intellij.openapi.vfs.impl.jrt;
 
 import com.intellij.ide.AppLifecycleListener;
 import com.intellij.lang.LangBundle;
@@ -30,6 +30,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.vfs.impl.ArchiveHandler;
 import com.intellij.openapi.vfs.newvfs.*;
 import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent;
similarity index 99%
rename from java/java-impl/src/com/intellij/openapi/vfs/JrtHandler.java
rename to java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandler.java
index dae670dbfef02569971e3d5f621b4abb86dfb97a..ef388ba8b55a6fbfe0ee8e5e935145c627f5b4b3 100644 (file)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vfs;
+package com.intellij.openapi.vfs.impl.jrt;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.impl.ArchiveHandler;
similarity index 96%
rename from java/java-impl/src/com/intellij/openapi/vfs/JrtHandlerStub.java
rename to java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandlerStub.java
index fa3f036e12e563fb713ef45dea475e0b28c8e62c..cf7f5da669e3400235c40b32931aaa0dd3b662ef 100644 (file)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vfs;
+package com.intellij.openapi.vfs.impl.jrt;
 
 import com.intellij.openapi.vfs.impl.ArchiveHandler;
 import org.jetbrains.annotations.NotNull;
index bbaadf8f7f811d5903b9d91425e9c3d0d7aefc02..3cd9dbcddfab9fa6b9dccf3688566a8e44b819ed 100644 (file)
@@ -17,6 +17,7 @@ package com.intellij.openapi.vfs;
 
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.testFramework.IdeaTestCase;
 import com.intellij.testFramework.LightPlatformTestCase;
 import org.junit.BeforeClass;
index f7dff8a422d92aeb21604453284b0e28d28bf10b..04e7ee32d1b60a22e4065dbedd5e68a4771dceae 100644 (file)
@@ -46,7 +46,7 @@
 
   <application-components>
     <component>
-      <implementation-class>com.intellij.openapi.vfs.JrtFileSystem</implementation-class>
+      <implementation-class>com.intellij.openapi.vfs.impl.jrt.JrtFileSystem</implementation-class>
     </component>
     <component>
       <implementation-class>com.intellij.util.xml.impl.JavaDomApplicationComponent</implementation-class>