From f28fbd6d9b2c07f35415c1589f731fdedc3a283f Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Apr 2011 18:40:54 +0400 Subject: [PATCH] cleanup --- .../intellij/execution/junit/JUnitUtil.java | 3 +-- .../InspectionProfileEntry.java | 2 +- .../ui/IDEInspectionToolsConfigurable.java | 2 +- .../ProjectInspectionToolsConfigurable.java | 2 +- ...ctInspectionToolsConfigurableProvider.java | 4 ++-- .../ide/actions/ShowSettingsAction.java | 2 +- .../ide/actions/ShowSettingsUtilImpl.java | 4 ++-- .../options/ex/ProjectConfigurablesGroup.java | 3 +-- .../util/io/PersistentEnumerator.java | 2 +- .../intellij/util/io/PersistentHashMap.java | 20 ++++++------------- 10 files changed, 17 insertions(+), 27 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index 680eeefac5ea..31ec84a2a9f4 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -66,8 +66,7 @@ public class JUnitUtil { } } } - final PsiParameter[] parameters = psiMethod.getParameterList().getParameters(); - return parameters.length == 0; + return psiMethod.getParameterList().getParametersCount() == 0; } public static boolean isTestMethod(final Location location) { diff --git a/platform/lang-api/src/com/intellij/codeInspection/InspectionProfileEntry.java b/platform/lang-api/src/com/intellij/codeInspection/InspectionProfileEntry.java index 3921b9ee1396..75b52733c3e6 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/InspectionProfileEntry.java +++ b/platform/lang-api/src/com/intellij/codeInspection/InspectionProfileEntry.java @@ -151,7 +151,7 @@ public abstract class InspectionProfileEntry { if (descriptionUrl == null) return null; return ResourceUtil.loadText(descriptionUrl); } - catch (IOException e2) { } + catch (IOException ignored) { } return null; } diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/IDEInspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/IDEInspectionToolsConfigurable.java index 88ea00579ea5..afc5cdd1b574 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/IDEInspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/IDEInspectionToolsConfigurable.java @@ -32,7 +32,7 @@ public class IDEInspectionToolsConfigurable extends InspectionToolsConfigurable } protected InspectionProfileImpl getCurrentProfile() { - return (InspectionProfileImpl)((InspectionProfileManager)myProfileManager).getRootProfile(); + return (InspectionProfileImpl)myProfileManager.getRootProfile(); } @Override diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurable.java index ef367ad40e19..4499379d2cff 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurable.java @@ -32,7 +32,7 @@ public class ProjectInspectionToolsConfigurable extends InspectionToolsConfigura } protected InspectionProfileImpl getCurrentProfile() { - return (InspectionProfileImpl)((InspectionProjectProfileManager)myProjectProfileManager).getProjectProfileImpl(); + return (InspectionProfileImpl)myProjectProfileManager.getProjectProfileImpl(); } @Override diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurableProvider.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurableProvider.java index 779dcdbb9bfd..251553000f5c 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurableProvider.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProjectInspectionToolsConfigurableProvider.java @@ -22,8 +22,8 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager; * @author nik */ public class ProjectInspectionToolsConfigurableProvider extends ErrorsConfigurableProvider { - private InspectionProfileManager myProfileManager; - private InspectionProjectProfileManager myProjectProfileManager; + private final InspectionProfileManager myProfileManager; + private final InspectionProjectProfileManager myProjectProfileManager; public ProjectInspectionToolsConfigurableProvider(InspectionProfileManager profileManager, InspectionProjectProfileManager projectProfileManager) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java index c08a10578675..2fe7f611501d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java @@ -46,7 +46,7 @@ public class ShowSettingsAction extends AnAction implements DumbAware { project = ProjectManager.getInstance().getDefaultProject(); } - ConfigurableGroup[] group = new ConfigurableGroup[]{ + ConfigurableGroup[] group = { new ProjectConfigurablesGroup(project), new IdeConfigurablesGroup() }; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java index 8291b985885d..2d52acbb2732 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java @@ -44,7 +44,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil { _showSettingsDialog(project, group, null); } - private void _showSettingsDialog(final Project project, ConfigurableGroup[] group, Configurable toSelect) { + private static void _showSettingsDialog(final Project project, ConfigurableGroup[] group, Configurable toSelect) { group = filterEmptyGroups(group); if ("false".equalsIgnoreCase(System.getProperty("new.options.editor"))) { @@ -83,7 +83,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil { return null; } - public void showSettingsDialog(@Nullable final Project project, final @NotNull String nameToSelect) { + public void showSettingsDialog(@Nullable final Project project, @NotNull final String nameToSelect) { ConfigurableGroup[] group; if (project == null) { group = new ConfigurableGroup[] {new IdeConfigurablesGroup()}; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java index f27722baad5d..7b59b0fe75c7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java @@ -50,8 +50,7 @@ public class ProjectConfigurablesGroup extends ConfigurablesGroupBase implements protected ConfigurableFilter getConfigurableFilter() { return new ConfigurableFilter() { public boolean isIncluded(final Configurable configurable) { - if (isDefault() && configurable instanceof NonDefaultProjectConfigurable) return false; - return true; + return !isDefault() || !(configurable instanceof NonDefaultProjectConfigurable); } }; } diff --git a/platform/util/src/com/intellij/util/io/PersistentEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentEnumerator.java index 6a47a2e50e1d..43686db55db2 100644 --- a/platform/util/src/com/intellij/util/io/PersistentEnumerator.java +++ b/platform/util/src/com/intellij/util/io/PersistentEnumerator.java @@ -66,7 +66,7 @@ public class PersistentEnumerator implements Forceable { private static final CacheKey ourFlyweight = new FlyweightKey(); - private final File myFile; + protected final File myFile; private static final int COLLISION_OFFSET = 0; private static final int KEY_HASHCODE_OFFSET = COLLISION_OFFSET + 4; private static final int KEY_REF_OFFSET = KEY_HASHCODE_OFFSET + 4; diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java index 2c8edb64005a..bd7f3352b211 100644 --- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java +++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java @@ -41,7 +41,6 @@ public class PersistentHashMap extends PersistentEnumerator{ private PersistentHashMapValueStorage myValueStorage; private final DataExternalizer myValueExternalizer; private static final long NULL_ADDR = 0; - private static final int NULL_SIZE = 0; private static final int INITIAL_INDEX_SIZE; static { String property = System.getProperty("idea.initialIndexSize"); @@ -50,7 +49,6 @@ public class PersistentHashMap extends PersistentEnumerator{ @NonNls public static final String DATA_FILE_EXTENSION = ".values"; - private final File myFile; private int myGarbageSize; private static final int VALUE_REF_OFFSET = RECORD_SIZE; private final byte[] myRecordBuffer = new byte[RECORD_SIZE + 8 + 4]; @@ -123,7 +121,7 @@ public class PersistentHashMap extends PersistentEnumerator{ //System.out.println("Flushing caches: " + myFile.getPath()); synchronized (PersistentHashMap.this) { synchronized (ourLock) { - PersistentHashMap.this.clearAppenderCaches(); + clearAppenderCaches(); } } } @@ -136,9 +134,8 @@ public class PersistentHashMap extends PersistentEnumerator{ public PersistentHashMap(final File file, KeyDescriptor keyDescriptor, DataExternalizer valueExternalizer, final int initialSize) throws IOException { super(checkDataFiles(file), keyDescriptor, initialSize); try { - myFile = file; myValueExternalizer = valueExternalizer; - myValueStorage = PersistentHashMapValueStorage.create(getDataFile(myFile).getPath()); + myValueStorage = PersistentHashMapValueStorage.create(getDataFile(file).getPath()); myGarbageSize = getMetaData(); if (makesSenseToCompact()) { @@ -247,12 +244,7 @@ public class PersistentHashMap extends PersistentEnumerator{ synchronized (ourLock) { return processAllDataObject(processor, new DataFilter() { public boolean accept(final int id) { - try { - return readValueId(id).address != NULL_ADDR; - } - catch (IOException ignored) { - } - return true; + return readValueId(id).address != NULL_ADDR; } }); } @@ -319,7 +311,7 @@ public class PersistentHashMap extends PersistentEnumerator{ } } - public synchronized final void markDirty() throws IOException { + public final synchronized void markDirty() throws IOException { markDirty(true); } @@ -389,14 +381,14 @@ public class PersistentHashMap extends PersistentEnumerator{ } } - private HeaderRecord readValueId(final int keyId) throws IOException { + private HeaderRecord readValueId(final int keyId) { HeaderRecord result = new HeaderRecord(); result.address = myStorage.getLong(keyId + VALUE_REF_OFFSET); result.size = myStorage.getInt(keyId + VALUE_REF_OFFSET + 8); return result; } - private void updateValueId(final int keyId, HeaderRecord value) throws IOException { + private void updateValueId(final int keyId, HeaderRecord value) { myStorage.putLong(keyId + VALUE_REF_OFFSET, value.address); myStorage.putInt(keyId + VALUE_REF_OFFSET + 8, value.size); }