From 6569ca585cc339f720c23ba72add38664764d3d7 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 22 Jan 2015 15:13:19 +0100 Subject: [PATCH] refElements: accept long as mask --- .../codeInspection/canBeFinal/CanBeFinalAnnotator.java | 2 +- .../com/intellij/codeInspection/reference/RefManager.java | 2 +- .../intellij/codeInspection/reference/RefEntityImpl.java | 6 +++--- .../intellij/codeInspection/reference/RefManagerImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java index 6bacd4e023dd..b5e36f69a0be 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java @@ -30,7 +30,7 @@ import java.util.*; */ class CanBeFinalAnnotator extends RefGraphAnnotatorEx { private final RefManager myManager; - public static int CAN_BE_FINAL_MASK; + public static long CAN_BE_FINAL_MASK; public CanBeFinalAnnotator(@NotNull RefManager manager) { myManager = manager; diff --git a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java index b46352670030..3cee6c300af4 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java @@ -97,7 +97,7 @@ public abstract class RefManager { @Nullable public abstract RefEntity getReference(String type, String fqName); - public abstract int getLastUsedMask(); + public abstract long getLastUsedMask(); public abstract T getExtension(@NotNull Key key); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java index 5ad5b1d33cf2..8fb3d4e704c8 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java @@ -42,7 +42,7 @@ public abstract class RefEntityImpl implements RefEntity { protected List myChildren; private final String myName; private Map myUserMap; - protected int myFlags; + protected long myFlags; protected final RefManagerImpl myManager; protected RefEntityImpl(String name, @NotNull RefManager manager) { @@ -138,11 +138,11 @@ public abstract class RefEntityImpl implements RefEntity { } } - public boolean checkFlag(int mask) { + public boolean checkFlag(long mask) { return BitUtil.isSet(myFlags, mask); } - public void setFlag(final boolean value, final int mask) { + public void setFlag(final boolean value, final long mask) { myFlags = BitUtil.set(myFlags, mask, value); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java index ce083ff09682..10d079ca5631 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java @@ -64,7 +64,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; public class RefManagerImpl extends RefManager { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.reference.RefManager"); - private int myLastUsedMask = 256 * 256 * 256 * 8; + private long myLastUsedMask = 256 * 256 * 256 * 8; @NotNull private final Project myProject; @@ -190,7 +190,7 @@ public class RefManagerImpl extends RefManager { } @Override - public int getLastUsedMask() { + public long getLastUsedMask() { myLastUsedMask *= 2; return myLastUsedMask; }