diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java index d6d498b7fef4..027a44ba6cef 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java @@ -330,7 +330,7 @@ public class ArtifactUtil { final List> compositeChildren = new SmartList>(); final List fileCopies = new SmartList(); final List dirCopies = new SmartList(); - ArtifactUtil.processElements(parent.getChildren(), context, artifactType, new Processor>() { + processElements(parent.getChildren(), context, artifactType, new Processor>() { public boolean process(PackagingElement element) { if (element instanceof CompositePackagingElement) { final CompositePackagingElement compositeElement = (CompositePackagingElement)element; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/InspectionMain.java b/platform/lang-impl/src/com/intellij/codeInspection/InspectionMain.java index 51e803076389..dfb6650142d7 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/InspectionMain.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/InspectionMain.java @@ -10,6 +10,8 @@ package com.intellij.codeInspection; import com.intellij.openapi.application.ApplicationStarter; +import java.util.Arrays; + public class InspectionMain implements ApplicationStarter { private InspectionApplication myApplication; @@ -20,7 +22,7 @@ public class InspectionMain implements ApplicationStarter { @SuppressWarnings({"HardCodedStringLiteral"}) public void premain(String[] args) { if (args.length < 4) { - System.err.println("invalid args:" + args); + System.err.println("invalid args:" + Arrays.toString(args)); printHelp(); } diff --git a/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java b/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java index af80d53012c2..e7bb90f779f9 100644 --- a/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java +++ b/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java @@ -16,7 +16,7 @@ import javax.swing.*; */ public class DefaultDebugExecutor extends Executor { @NonNls public static final String EXECUTOR_ID = ToolWindowId.DEBUG; - private static final Icon TOOLWINDOW_ICON = IconLoader.getIcon("/general/toolWindowDebugger.png"); + private static final Icon TOOL_WINDOW_ICON = IconLoader.getIcon("/general/toolWindowDebugger.png"); private static final Icon ICON = IconLoader.getIcon("/actions/startDebugger.png"); private static final Icon DISABLED_ICON = IconLoader.getIcon("/process/disabledDebug.png"); private final String myStartActionText = XDebuggerBundle.message("debugger.runner.start.action.text"); @@ -27,7 +27,7 @@ public class DefaultDebugExecutor extends Executor { } public Icon getToolWindowIcon() { - return TOOLWINDOW_ICON; + return TOOL_WINDOW_ICON; } @NotNull diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java index 3bf400250fc2..32c5fe67b657 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java @@ -44,9 +44,9 @@ import java.util.Comparator; */ public abstract class XBreakpointType, P extends XBreakpointProperties> { public static final ExtensionPointName EXTENSION_POINT_NAME = ExtensionPointName.create("com.intellij.xdebugger.breakpointType"); - private @NonNls @NotNull String myId; - private @Nls @NotNull String myTitle; - private boolean mySuspendThreadSupported; + private final @NonNls @NotNull String myId; + private final @Nls @NotNull String myTitle; + private final boolean mySuspendThreadSupported; /** * @param id an unique id of breakpoint type diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java index 6bd951a1cc11..00ad66263635 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/evaluation/XDebuggerEvaluator.java @@ -75,7 +75,7 @@ public abstract class XDebuggerEvaluator { void errorOccurred(@NotNull String errorMessage); /** - * @deprecated use {@link XDebuggerEvaluator.XEvaluationCallback#errorOccurred(String)} + * @deprecated use {@link XEvaluationCallback#errorOccurred(String)} */ @Deprecated void errorOccured(@NotNull String errorMessage); diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java index 4855ec49a381..9f2ba6f37680 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java @@ -13,8 +13,8 @@ import java.util.List; */ public abstract class XExecutionStack { public static final XExecutionStack[] EMPTY_ARRAY = new XExecutionStack[0]; - private String myDisplayName; - private Icon myIcon; + private final String myDisplayName; + private final Icon myIcon; protected XExecutionStack(final String displayName) { this(displayName, DebuggerIcons.SUSPENDED_THREAD_ICON); diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java index 54718f3f1fb0..cfd074405dda 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java @@ -29,7 +29,7 @@ public abstract class XValueModifier { void errorOccurred(@NotNull String errorMessage); /** - * @deprecated use {@link XValueModifier.XModificationCallback#errorOccurred(String)} + * @deprecated use {@link XModificationCallback#errorOccurred(String)} */ @Deprecated void errorOccured(@NotNull String errorMessage); diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/stepping/PsiBackedSmartStepIntoVariant.java b/platform/xdebugger-api/src/com/intellij/xdebugger/stepping/PsiBackedSmartStepIntoVariant.java index 28a6a341a91c..3dd3e14eaf89 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/stepping/PsiBackedSmartStepIntoVariant.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/stepping/PsiBackedSmartStepIntoVariant.java @@ -31,8 +31,8 @@ import javax.swing.*; * To change this template use File | Settings | File Templates. */ public class PsiBackedSmartStepIntoVariant extends XSmartStepIntoVariant { - public final T myElement; - private ItemPresentation myPresentation; + private final T myElement; + private final ItemPresentation myPresentation; public PsiBackedSmartStepIntoVariant(@NotNull T element) { myElement = element; @@ -49,4 +49,8 @@ public class PsiBackedSmartStepIntoVariant slaveBreakpoints = dependentBreakpointManager.getAllSlaveBreakpoints(); + Set> slaveBreakpoints = dependentBreakpointManager.getAllSlaveBreakpoints(); Set> breakpointTypes = new HashSet>(); for (XBreakpointHandler handler : myDebugProcess.getBreakpointHandlers()) { breakpointTypes.add(getBreakpointTypeClass(handler)); } - for (XBreakpointBase slaveBreakpoint : slaveBreakpoints) { + for (XBreakpoint slaveBreakpoint : slaveBreakpoints) { if (breakpointTypes.contains(slaveBreakpoint.getType())) { myDisabledSlaveBreakpoints.add(slaveBreakpoint); } @@ -227,6 +227,7 @@ public class XDebugSessionImpl implements XDebugSession { private > void processBreakpoint(final XBreakpoint breakpoint, final XBreakpointHandler handler, boolean register) { XBreakpointType type = breakpoint.getType(); if (handler.getBreakpointTypeClass().equals(type.getClass())) { + //noinspection unchecked B b = (B)breakpoint; handleBreakpoint(handler, b, register, false); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XDependentBreakpointManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XDependentBreakpointManager.java index ef780179ed12..300b752a1aea 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XDependentBreakpointManager.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XDependentBreakpointManager.java @@ -14,7 +14,7 @@ import java.util.*; * @author nik */ public class XDependentBreakpointManager { - private final Map mySlave2Info = new HashMap(); + private final Map, XDependentBreakpointInfo> mySlave2Info = new HashMap, XDependentBreakpointInfo>(); private final MultiValuesMap myMaster2Info = new MultiValuesMap(); private final XBreakpointManagerImpl myBreakpointManager; private final EventDispatcher myDispatcher; @@ -157,7 +157,7 @@ public class XDependentBreakpointManager { return myMaster2Info.containsKey((XBreakpointBase)breakpoint) || mySlave2Info.containsKey(breakpoint); } - public Set getAllSlaveBreakpoints() { + public Set> getAllSlaveBreakpoints() { return mySlave2Info.keySet(); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsTree.java index da41983298a4..d2b60aedd913 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsTree.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsTree.java @@ -148,10 +148,8 @@ public class XBreakpointsTree> extends CheckboxTree { } private static class BreakpointsTreeCellRenderer extends CheckboxTreeCellRenderer { - public void customizeCellRenderer(final JTree tree, - final Object value, - final boolean selected, - final boolean expanded, final boolean leaf, final int row, final boolean hasFocus) { + @Override + public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { if (value instanceof BreakpointNode) { BreakpointNode node = (BreakpointNode)value; XBreakpoint breakpoint = node.getBreakpoint();