From 184d673ba5b450bea3f7568189e25f5bdbc7a3a1 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 29 Oct 2014 17:38:43 +0300 Subject: [PATCH] moved classes to separate package --- .../src/com/intellij/psi/RefQueueIndex.java | 1 + .../intellij/psi/refResolve}/PersistentIntList.java | 4 ++-- .../intellij/psi/refResolve}/PersistentIntList.png | Bin .../psi/{ => refResolve}/RefResolveServiceImpl.java | 6 +++--- resources/src/META-INF/IdeaPlugin.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename {platform/indexing-impl/src/com/intellij/psi/impl => java/java-impl/src/com/intellij/psi/refResolve}/PersistentIntList.java (99%) rename {platform/indexing-impl/src/com/intellij/psi/impl => java/java-impl/src/com/intellij/psi/refResolve}/PersistentIntList.png (100%) rename java/java-impl/src/com/intellij/psi/{ => refResolve}/RefResolveServiceImpl.java (99%) diff --git a/java/java-impl/src/com/intellij/psi/RefQueueIndex.java b/java/java-impl/src/com/intellij/psi/RefQueueIndex.java index 55c9798e1e2d..916955b20b98 100644 --- a/java/java-impl/src/com/intellij/psi/RefQueueIndex.java +++ b/java/java-impl/src/com/intellij/psi/RefQueueIndex.java @@ -17,6 +17,7 @@ package com.intellij.psi; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.refResolve.RefResolveServiceImpl; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; import com.intellij.util.io.KeyDescriptor; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/PersistentIntList.java b/java/java-impl/src/com/intellij/psi/refResolve/PersistentIntList.java similarity index 99% rename from platform/indexing-impl/src/com/intellij/psi/impl/PersistentIntList.java rename to java/java-impl/src/com/intellij/psi/refResolve/PersistentIntList.java index 8306cda2bfe1..8c4d45c9856f 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/PersistentIntList.java +++ b/java/java-impl/src/com/intellij/psi/refResolve/PersistentIntList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi.impl; +package com.intellij.psi.refResolve; import com.intellij.openapi.Disposable; import com.intellij.util.ArrayUtil; @@ -34,7 +34,7 @@ import java.util.Arrays; * *

(to edit the diagram go to www.draw.io, "Import from", this PersistentIntList.png)

*/ -public class PersistentIntList implements Disposable { +class PersistentIntList implements Disposable { public static final int MAX_DATA_BYTES = 500000000; public static final int MAX_LIST_LENGTH = 10000000; private final FileChannel data; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/PersistentIntList.png b/java/java-impl/src/com/intellij/psi/refResolve/PersistentIntList.png similarity index 100% rename from platform/indexing-impl/src/com/intellij/psi/impl/PersistentIntList.png rename to java/java-impl/src/com/intellij/psi/refResolve/PersistentIntList.png diff --git a/java/java-impl/src/com/intellij/psi/RefResolveServiceImpl.java b/java/java-impl/src/com/intellij/psi/refResolve/RefResolveServiceImpl.java similarity index 99% rename from java/java-impl/src/com/intellij/psi/RefResolveServiceImpl.java rename to java/java-impl/src/com/intellij/psi/refResolve/RefResolveServiceImpl.java index bb2a71953af3..d6c1593d61ef 100644 --- a/java/java-impl/src/com/intellij/psi/RefResolveServiceImpl.java +++ b/java/java-impl/src/com/intellij/psi/refResolve/RefResolveServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.psi; +package com.intellij.psi.refResolve; import com.intellij.concurrency.JobSchedulerImpl; import com.intellij.ide.PowerSaveMode; @@ -52,7 +52,7 @@ import com.intellij.openapi.vfs.newvfs.NewVirtualFile; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; import com.intellij.openapi.vfs.newvfs.persistent.FSRecords; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS; -import com.intellij.psi.impl.PersistentIntList; +import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ArrayUtil; @@ -294,7 +294,7 @@ public class RefResolveServiceImpl extends RefResolveService implements Runnable return false; } - static boolean isSupportedFileType(@NotNull VirtualFile virtualFile) { + public static boolean isSupportedFileType(@NotNull VirtualFile virtualFile) { if (virtualFile.isDirectory()) return true; if (virtualFile.getFileType() == StdFileTypes.JAVA) return true; if (virtualFile.getFileType() == StdFileTypes.XML && !ProjectCoreUtil.isProjectOrWorkspaceFile(virtualFile)) return true; diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 771b91faf2c8..808ebcb3178f 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -42,7 +42,7 @@ com.intellij.psi.RefResolveService - com.intellij.psi.RefResolveServiceImpl + com.intellij.psi.refResolve.RefResolveServiceImpl