MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup (final)

Browse Source 
GitOrigin-RevId: 93607e195763f2acf29ee0d7a280d7e07e8d2f14
This commit is contained in:
Vladimir Krivosheev
2020-06-26 10:39:01 +02:00
committed by intellij-monorepo-bot
parent 2294d15bfa
commit d4e9b09e26
1884 changed files with 3911 additions and 11974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RegExpSupport/src/org/intellij/lang/regexp/RegExpBundle.java
View File

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class RegExpBundle extends DynamicBundle {
public final class RegExpBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.RegExpBundle";
private static final RegExpBundle INSTANCE = new RegExpBundle();

2
RegExpSupport/src/org/intellij/lang/regexp/inspection/DuplicateCharacterInClassInspection.java
View File

@@ -63,7 +63,7 @@ public class DuplicateCharacterInClassInspection extends LocalInspectionTool {
}
}
private static class DuplicateCharacterInClassFix implements LocalQuickFix {
private static final class DuplicateCharacterInClassFix implements LocalQuickFix {
private final String myText;

4
RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpEquivalenceChecker.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.lang.regexp.inspection;
import com.intellij.openapi.util.text.StringUtil;
@@ -11,7 +11,7 @@ import java.util.Comparator;
/**
* @author Bas Leijdekkers
*/
class RegExpEquivalenceChecker {
final class RegExpEquivalenceChecker {
private static final Comparator<PsiElement> TEXT_COMPARATOR = Comparator.comparing(PsiElement::getText);

2
RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpReplacementUtil.java
View File

@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author Bas Leijdekkers
*/
public class RegExpReplacementUtil {
public final class RegExpReplacementUtil {
/**
* Dummy text that never needs escaping

18
images/src/org/intellij/images/ImagesBundle.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.images;
import com.intellij.DynamicBundle;
@@ -22,7 +8,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class ImagesBundle extends DynamicBundle {
public final class ImagesBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.ImagesBundle";
private static final ImagesBundle INSTANCE = new ImagesBundle();

18
images/src/org/intellij/images/util/imageio/CommonsImagingImageReaderSpi.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.images.util.imageio;
import com.intellij.openapi.util.io.FileUtil;
@@ -151,7 +137,7 @@ public class CommonsImagingImageReaderSpi extends ImageReaderSpi {
}
}
private static class MyImageReader extends ImageReader {
private static final class MyImageReader extends ImageReader {
private byte[] myBytes;
private ImageInfo myInfo;
private BufferedImage[] myImages;

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutUtils.java
View File

@@ -1,25 +1,11 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.compiler;
import com.jgoodies.forms.layout.FormLayout;
import com.jgoodies.forms.layout.FormSpec;
public class FormLayoutUtils {
public final class FormLayoutUtils {
private FormLayoutUtils() {
}

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/BorderLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -24,7 +10,7 @@ import java.awt.*;
/**
* @author yole
*/
public class BorderLayoutSerializer extends LayoutSerializer {
public final class BorderLayoutSerializer extends LayoutSerializer {
public static final BorderLayoutSerializer INSTANCE = new BorderLayoutSerializer();
private BorderLayoutSerializer() {

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/CardLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -24,7 +10,7 @@ import java.awt.*;
/**
* @author yole
*/
public class CardLayoutSerializer extends LayoutSerializer {
public final class CardLayoutSerializer extends LayoutSerializer {
public static final CardLayoutSerializer INSTANCE = new CardLayoutSerializer();
private CardLayoutSerializer() {

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FlowLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -24,7 +10,7 @@ import java.awt.*;
/**
* @author yole
*/
public class FlowLayoutSerializer extends LayoutSerializer {
public final class FlowLayoutSerializer extends LayoutSerializer {
public static final FlowLayoutSerializer INSTANCE = new FlowLayoutSerializer();
private FlowLayoutSerializer() {

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FormLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -29,7 +15,7 @@ import java.util.List;
/**
* @author yole
*/
public class FormLayoutSerializer extends GridLayoutSerializer {
public final class FormLayoutSerializer extends GridLayoutSerializer {
private FormLayoutSerializer() {
}

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/GridBagLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -22,7 +8,7 @@ import org.jdom.Element;
import java.awt.*;
public class GridBagLayoutSerializer extends GridLayoutSerializer {
public final class GridBagLayoutSerializer extends GridLayoutSerializer {
private GridBagLayoutSerializer() {
}

18
java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/XYLayoutSerializer.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.lw;
@@ -24,7 +10,7 @@ import java.awt.*;
/**
* @author yole
*/
public class XYLayoutSerializer extends LayoutSerializer {
public final class XYLayoutSerializer extends LayoutSerializer {
static XYLayoutSerializer INSTANCE = new XYLayoutSerializer();
private XYLayoutSerializer() {

2
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
View File

@@ -1054,7 +1054,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
return artifacts.isEmpty();
}
private static class CompiledPattern {
private static final class CompiledPattern {
@NotNull final Pattern fileName;
@Nullable final Pattern dir;
@Nullable final Pattern srcRoot;

18
java/compiler/impl/src/com/intellij/compiler/CompilerIOUtil.java
View File

@@ -1,25 +1,11 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
public class CompilerIOUtil {
public final class CompilerIOUtil {
private final static ThreadLocal<byte[]> myBuffer = ThreadLocal.withInitial(() -> new byte[1024]);
private CompilerIOUtil() {}

2
java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java
View File

@@ -573,7 +573,7 @@ public class CompilerManagerImpl extends CompilerManager {
}
}
private class ListenerNotificator implements CompileStatusNotification {
private final class ListenerNotificator implements CompileStatusNotification {
private final @Nullable CompileStatusNotification myDelegate;
private ListenerNotificator(@Nullable CompileStatusNotification delegate) {

28
java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.actions;
import com.intellij.ide.highlighter.JavaFileType;
@@ -144,7 +130,7 @@ public class BuildArtifactAction extends DumbAwareAction {
return artifacts.toArray(new Artifact[0]);
}
private static class BuildArtifactItem extends ArtifactActionItem {
private static final class BuildArtifactItem extends ArtifactActionItem {
private BuildArtifactItem(List<ArtifactPopupItem> item, Project project) {
super(item, project, "Build");
}
@@ -155,7 +141,7 @@ public class BuildArtifactAction extends DumbAwareAction {
}
}
private static class CleanArtifactItem extends ArtifactActionItem {
private static final class CleanArtifactItem extends ArtifactActionItem {
private CleanArtifactItem(@NotNull List<ArtifactPopupItem> item, @NotNull Project project) {
super(item, project, "Clean");
}
@@ -228,7 +214,7 @@ public class BuildArtifactAction extends DumbAwareAction {
}
}
private static class RebuildArtifactItem extends ArtifactActionItem {
private static final class RebuildArtifactItem extends ArtifactActionItem {
private RebuildArtifactItem(List<ArtifactPopupItem> item, Project project) {
super(item, project, "Rebuild");
}
@@ -239,7 +225,7 @@ public class BuildArtifactAction extends DumbAwareAction {
}
}
private static class EditArtifactItem extends ArtifactActionItem {
private static final class EditArtifactItem extends ArtifactActionItem {
private final ArtifactAwareProjectSettingsService mySettingsService;
private EditArtifactItem(List<ArtifactPopupItem> item, Project project, final ArtifactAwareProjectSettingsService projectSettingsService) {
@@ -269,7 +255,7 @@ public class BuildArtifactAction extends DumbAwareAction {
}
}
private static class ArtifactPopupItem {
private static final class ArtifactPopupItem {
@Nullable private final Artifact myArtifact;
private final String myText;
private final Icon myIcon;
@@ -298,7 +284,7 @@ public class BuildArtifactAction extends DumbAwareAction {
return artifact != null ? Collections.singletonList(artifact) : ArtifactUtil.getArtifactWithOutputPaths(project);
}
}
private static class ChooseArtifactStep extends MultiSelectionListPopupStep<ArtifactPopupItem> {
private final Artifact myFirst;
private final Project myProject;

18
java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerElementRetriever.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.backwardRefs;
import com.intellij.compiler.CompilerReferenceService;
@@ -106,7 +92,7 @@ public class JavaCompilerElementRetriever {
}
}
private static class ClassMatcher {
private static final class ClassMatcher {
@Nullable
private final TIntHashSet myAnonymousIndices;
@NotNull

4
java/compiler/impl/src/com/intellij/compiler/chainsSearch/OperationChain.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.chainsSearch;
import com.intellij.compiler.chainsSearch.context.ChainCompletionContext;
@@ -19,7 +19,7 @@ import java.util.Set;
import java.util.stream.Collectors;
public class OperationChain {
public final class OperationChain {
private static final Logger LOG = Logger.getInstance(OperationChain.class);
private final ChainOperation @NotNull [] myReverseOperations;

4
java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.chainsSearch.context;
import com.intellij.compiler.CompilerReferenceService;
@@ -213,7 +213,7 @@ public class ChainCompletionContext {
return result;
}
private static class ContextProcessor implements PsiScopeProcessor, ElementClassHint {
private static final class ContextProcessor implements PsiScopeProcessor, ElementClassHint {
private final List<PsiNamedElement> myContextElements = new SmartList<>();
private final PsiVariable myCompletionVariable;
private final PsiResolveHelper myResolveHelper;

2
java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java
View File

@@ -211,7 +211,7 @@ public final class FrequentlyUsedInheritorInspection extends AbstractBaseJavaLoc
return index.isInContent(file);
}
private static class ClassAndInheritorCount implements Comparable<ClassAndInheritorCount> {
private static final class ClassAndInheritorCount implements Comparable<ClassAndInheritorCount> {
private final PsiClass psi;
private final CompilerRef.CompilerClassHierarchyElementDef descriptor;
private final int number;

4
java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.options;
import com.intellij.openapi.compiler.JavaCompilerBundle;
@@ -144,7 +144,7 @@ public class TargetOptionsComponent extends JPanel {
((ModuleOptionsTableModel)myTable.getModel()).setModuleOptions(myProject, moduleLevels);
}
private static class TargetLevelCellEditor extends DefaultCellEditor {
private static final class TargetLevelCellEditor extends DefaultCellEditor {
private TargetLevelCellEditor() {
super(createTargetOptionsCombo());
setClickCountToStart(0);

2
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
View File

@@ -1724,7 +1724,7 @@ public final class BuildManager implements Disposable {
}
}
private static class ProjectData {
private static final class ProjectData {
@NotNull
final ExecutorService taskQueue;
private final Set<InternedPath> myChanged = new THashSet<>();

18
java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.compiler.util;
import com.intellij.compiler.impl.FileSetCompileScope;
@@ -34,7 +20,7 @@ import java.util.Collection;
/**
* @author peter
*/
public class InspectionValidatorUtil {
public final class InspectionValidatorUtil {
private InspectionValidatorUtil() {
}

18
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.artifacts;
import com.intellij.compiler.CompilerConfiguration;
@@ -41,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class ArtifactUtil {
public final class ArtifactUtil {
private ArtifactUtil() {
}

20
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementPath.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.artifacts;
import com.intellij.packaging.artifacts.Artifact;
@@ -26,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.stream.Collectors;
public class PackagingElementPath {
public final class PackagingElementPath {
public static final PackagingElementPath EMPTY = new PackagingElementPath(null, null);
private final PackagingElementPath myParentPath;
private final PackagingElement<?> myLastElement;
@@ -60,7 +46,7 @@ public class PackagingElementPath {
// StringUtil.join ignores empty strings whereas this monstrosity doesn't
return ContainerUtil.reverse(parents).stream().map(RenameablePackagingElement::getName).collect(Collectors.joining("/"));
}
public List<CompositePackagingElement<?>> getParents() {
return getParentsFrom(null);
}

20
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.compiler;
import com.intellij.compiler.impl.ModuleCompileScope;
@@ -34,11 +20,11 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class ArtifactCompileScope {
public final class ArtifactCompileScope {
private static final Key<Boolean> FORCE_ARTIFACT_BUILD = Key.create("force_artifact_build");
private static final Key<Artifact[]> ARTIFACTS_KEY = Key.create("artifacts");
private static final Key<Set<Artifact>> CACHED_ARTIFACTS_KEY = Key.create("cached_artifacts");
private ArtifactCompileScope() {
}

18
java/compiler/impl/src/com/intellij/packaging/impl/elements/FacetBasedPackagingElementType.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.elements;
import com.intellij.facet.Facet;
@@ -84,7 +70,7 @@ public abstract class FacetBasedPackagingElementType<E extends PackagingElement<
protected abstract String getItemText(F item);
private class ChooseFacetsDialog extends ChooseElementsDialog<F> {
private final class ChooseFacetsDialog extends ChooseElementsDialog<F> {
private ChooseFacetsDialog(Project project, List<? extends F> items, String title, String description) {
super(project, items, title, description, true);
}

4
java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.elements;
import com.intellij.CommonBundle;
@@ -56,7 +56,7 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
public class ManifestFileUtil {
public final class ManifestFileUtil {
private static final Logger LOG = Logger.getInstance(ManifestFileUtil.class);
public static final String MANIFEST_PATH = JarFile.MANIFEST_NAME;
public static final String MANIFEST_FILE_NAME = PathUtil.getFileName(MANIFEST_PATH);

18
java/compiler/impl/src/com/intellij/packaging/impl/elements/ProductionModuleOutputElementType.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.elements;
import com.intellij.icons.AllIcons;
@@ -25,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
public class ProductionModuleOutputElementType extends ModuleOutputElementTypeBase<ProductionModuleOutputPackagingElement> {
public final class ProductionModuleOutputElementType extends ModuleOutputElementTypeBase<ProductionModuleOutputPackagingElement> {
public static final ProductionModuleOutputElementType ELEMENT_TYPE = new ProductionModuleOutputElementType();
private ProductionModuleOutputElementType() {

2
java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java
View File

@@ -13,7 +13,7 @@ import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
import javax.swing.*;
public class TestModuleOutputElementType extends ModuleOutputElementTypeBase<TestModuleOutputPackagingElement> {
public final class TestModuleOutputElementType extends ModuleOutputElementTypeBase<TestModuleOutputPackagingElement> {
public static final TestModuleOutputElementType ELEMENT_TYPE = new TestModuleOutputElementType();
private TestModuleOutputElementType() {

18
java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.impl.ui.actions;
import com.intellij.notification.Notification;
@@ -51,7 +37,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class PackageFileWorker {
public final class PackageFileWorker {
private static final Logger LOG = Logger.getInstance(PackageFileWorker.class);
private final File myFile;
private final String myRelativeOutputPath;

4
java/compiler/impl/src/com/intellij/task/impl/JpsProjectTaskRunner.java
View File

@@ -314,7 +314,7 @@ public class JpsProjectTaskRunner extends ProjectTaskRunner {
}
}
private static class MyNotificationCollector implements AutoCloseable {
private static final class MyNotificationCollector implements AutoCloseable {
@NotNull private final ProjectTaskContext myContext;
@Nullable private final ProjectTaskNotification myTaskNotification;
@NotNull private final Runnable myOnFinished;
@@ -371,7 +371,7 @@ public class JpsProjectTaskRunner extends ProjectTaskRunner {
}
}
private static class MyCompileStatusNotification implements CompileStatusNotification {
private static final class MyCompileStatusNotification implements CompileStatusNotification {
private final MyNotificationCollector myCollector;
private final AtomicBoolean finished = new AtomicBoolean();

20
java/compiler/instrumentation-util/src/com/intellij/compiler/instrumentation/InstrumentationClassFinder.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.instrumentation;
import org.jetbrains.org.objectweb.asm.ClassReader;
@@ -229,7 +215,7 @@ public class InstrumentationClassFinder {
return new PseudoClass(this, visitor.myName, visitor.mySuperclassName, visitor.myInterfaces, visitor.myModifiers, visitor.myMethods);
}
public static class PseudoClass {
public static final class PseudoClass {
static final PseudoClass NULL_OBJ = new PseudoClass(null, null, null, null, 0, null);
private final String myName;
private final String mySuperClass;
@@ -427,7 +413,7 @@ public class InstrumentationClassFinder {
}
}
private static class V extends ClassVisitor {
private static final class V extends ClassVisitor {
public String mySuperclassName = null;
public String[] myInterfaces = null;
public String myName = null;

4
java/compiler/instrumentation-util/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.notNullVerification;
import com.intellij.compiler.instrumentation.FailSafeClassReader;
@@ -12,7 +12,7 @@ import java.util.*;
/**
* @author ven
*/
public class NotNullVerifyingInstrumenter extends ClassVisitor implements Opcodes {
public final class NotNullVerifyingInstrumenter extends ClassVisitor implements Opcodes {
private static final String IAE_CLASS_NAME = "java/lang/IllegalArgumentException";
private static final String ISE_CLASS_NAME = "java/lang/IllegalStateException";

18
java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.compiler;
import com.intellij.DynamicBundle;
@@ -22,7 +8,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class JavaCompilerBundle extends DynamicBundle {
public final class JavaCompilerBundle extends DynamicBundle {
@NonNls public static final String BUNDLE = "messages.JavaCompilerBundle";
private static final JavaCompilerBundle INSTANCE = new JavaCompilerBundle();

18
java/compiler/openapi/src/com/intellij/openapi/compiler/make/ManifestBuilder.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.compiler.make;
import com.intellij.openapi.application.ApplicationNamesInfo;
@@ -20,7 +6,7 @@ import org.jetbrains.annotations.NonNls;
import java.util.jar.Attributes;
public class ManifestBuilder {
public final class ManifestBuilder {
@NonNls private static final String NAME = "Created-By";
private static final Attributes.Name CREATED_BY = new Attributes.Name(NAME);

18
java/compiler/openapi/src/com/intellij/packaging/ui/PackagingElementWeights.java
View File

@@ -1,21 +1,7 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.ui;
public class PackagingElementWeights {
public final class PackagingElementWeights {
public static final int ARTIFACT = 100;
public static final int DIRECTORY = 50;
public static final int DIRECTORY_COPY = 40;

18
java/compiler/openapi/src/com/intellij/packaging/ui/SourceItemWeights.java
View File

@@ -1,21 +1,7 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.packaging.ui;
public class SourceItemWeights {
public final class SourceItemWeights {
public static final int ARTIFACTS_GROUP_WEIGHT = 200;
public static final int ARTIFACT_WEIGHT = 150;
public static final int MODULE_GROUP_WEIGHT = 100;

2
java/compiler/tests/com/intellij/compiler/artifacts/ArtifactUtilTest.java
View File

@@ -85,7 +85,7 @@ public class ArtifactUtilTest extends PackagingElementsTestCase {
ArtifactUtil.processDirectoryChildren(rootElement, PackagingElementPath.EMPTY, relativePath, getContext(), PlainArtifactType.getInstance(), processor);
}
private static class ElementToStringCollector extends PackagingElementProcessor<PackagingElement<?>> {
private static final class ElementToStringCollector extends PackagingElementProcessor<PackagingElement<?>> {
private final StringBuilder myBuilder = new StringBuilder();
private final boolean myAddParentPaths;

3
java/compiler/tests/com/intellij/compiler/artifacts/TestPackagingElementBuilder.java
View File

@@ -1,3 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.artifacts;
import com.intellij.openapi.module.Module;
@@ -9,7 +10,7 @@ import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.elements.PackagingElementFactory;
public class TestPackagingElementBuilder {
public final class TestPackagingElementBuilder {
private final CompositePackagingElement<?> myElement;
private final TestPackagingElementBuilder myParent;
private final Project myProject;

2
java/debugger/impl/src/com/intellij/debugger/actions/StepOutOfBlockAction.java
View File

@@ -76,7 +76,7 @@ public class StepOutOfBlockAction extends DebuggerAction implements DumbAware {
!((XDebugSessionImpl)session).isReadOnly() && session.isSuspended());
}
private static class BlockFilter implements MethodFilter {
private static final class BlockFilter implements MethodFilter {
private final Range<Integer> myLines;
private BlockFilter(int startLine, int endLine) {

4
java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.actions;
import com.intellij.CommonBundle;
@@ -86,7 +86,7 @@ public class ViewTextAction extends XFetchValueActionBase {
// dialog.show();
//}
private static class MyDialog extends DialogWrapper {
private static final class MyDialog extends DialogWrapper {
private final TextViewer myTextViewer;
private final XValueNodeImpl myStringNode;

2
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
View File

@@ -1768,7 +1768,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
}
private class RunToCursorCommand extends StepCommand {
private final class RunToCursorCommand extends StepCommand {
private final RunToCursorBreakpoint myRunToCursorBreakpoint;
private final boolean myIgnoreBreakpoints;

2
java/debugger/impl/src/com/intellij/debugger/engine/ThreadBlockedMonitor.java
View File

@@ -156,7 +156,7 @@ public class ThreadBlockedMonitor {
});
}
public static class InvocationWatcher {
public static final class InvocationWatcher {
private final AtomicBoolean myObsolete = new AtomicBoolean();
private final AtomicBoolean myAllResumed = new AtomicBoolean();
private final Future myTask;

22
java/debugger/impl/src/com/intellij/debugger/engine/dfaassist/DfaAssist.java
View File

@@ -56,7 +56,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
public class DfaAssist implements DebuggerContextListener, Disposable {
public final class DfaAssist implements DebuggerContextListener, Disposable {
private static final int CLEANUP_DELAY_MILLIS = 300;
private final @NotNull Project myProject;
private InlaySet myInlays = new InlaySet(null, Collections.emptyList()); // modified from EDT only
@@ -64,14 +64,14 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
private volatile ScheduledFuture<?> myScheduledCleanup;
private final DebuggerStateManager myManager;
private volatile boolean myActive;
private DfaAssist(@NotNull Project project, @NotNull DebuggerStateManager manager) {
myProject = project;
myManager = manager;
setActive(ViewsGeneralSettings.getInstance().USE_DFA_ASSIST);
}
private static class InlaySet implements Disposable {
private static final class InlaySet implements Disposable {
private final @NotNull List<Inlay<?>> myInlays;
private InlaySet(@Nullable Editor editor, @NotNull List<Inlay<?>> inlays) {
@@ -93,7 +93,7 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
myInlays.clear();
}
}
@Override
public void changeEvent(@NotNull DebuggerContextImpl newContext, DebuggerSession.Event event) {
if (event == DebuggerSession.Event.DISPOSE) {
@@ -149,7 +149,7 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
try {
return createDfaRunner(proxy, pointer.getElement());
}
catch (VMDisconnectedException | VMOutOfMemoryException | InternalException |
catch (VMDisconnectedException | VMOutOfMemoryException | InternalException |
EvaluateException | InconsistentDebugInfoException | InvalidStackFrameException ignore) {
return null;
}
@@ -318,9 +318,9 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
if (parent instanceof PsiMethod || parent instanceof PsiLambdaExpression || parent instanceof PsiClassInitializer ||
// We cannot properly restore context if we started from finally, so let's analyze just finally block
parent instanceof PsiTryStatement && ((PsiTryStatement)parent).getFinallyBlock() == e ||
parent instanceof PsiBlockStatement &&
(parent.getParent() instanceof PsiLoopStatement ||
parent.getParent() instanceof PsiSwitchLabeledRuleStatement &&
parent instanceof PsiBlockStatement &&
(parent.getParent() instanceof PsiLoopStatement ||
parent.getParent() instanceof PsiSwitchLabeledRuleStatement &&
((PsiSwitchLabeledRuleStatement)parent.getParent()).getEnclosingSwitchBlock() instanceof PsiSwitchExpression)) {
if (parent.getParent() instanceof PsiDoWhileStatement) {
return parent.getParent();
@@ -335,7 +335,7 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
return null;
}
private class TurnOffDfaProcessorAction extends AnAction {
private final class TurnOffDfaProcessorAction extends AnAction {
private TurnOffDfaProcessorAction() {
super(JavaDebuggerBundle.message("action.TurnOffDfaAssist.text"),
JavaDebuggerBundle.message("action.TurnOffDfaAssist.description"), AllIcons.Actions.Cancel);
@@ -345,9 +345,9 @@ public class DfaAssist implements DebuggerContextListener, Disposable {
Disposer.dispose(DfaAssist.this);
}
}
/**
* Install dataflow assistant to the specified debugging session
* Install dataflow assistant to the specified debugging session
* @param javaSession JVM debugger session to install an assistant to
* @param session X debugger session
*/

18
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakContinueStatementEvaluator.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.engine.evaluation.expression;
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
@@ -20,7 +6,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
/**
* @author lex
*/
public class BreakContinueStatementEvaluator {
public final class BreakContinueStatementEvaluator {
private BreakContinueStatementEvaluator() {
}

4
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/DisableGC.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.engine.evaluation.expression;
import com.intellij.debugger.engine.evaluation.EvaluateException;
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author Eugene Zhuravlev
*/
public class DisableGC implements Evaluator {
public final class DisableGC implements Evaluator {
private final Evaluator myDelegate;
private DisableGC(@NotNull Evaluator delegate) {

4
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
View File

@@ -44,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class EvaluatorBuilderImpl implements EvaluatorBuilder {
public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
private static final EvaluatorBuilderImpl ourInstance = new EvaluatorBuilderImpl();
private EvaluatorBuilderImpl() {
@@ -73,7 +73,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
return new Builder(position).buildElement(codeFragment);
}
private static class Builder extends JavaElementVisitor {
private static final class Builder extends JavaElementVisitor {
private static final Logger LOG = Logger.getInstance(EvaluatorBuilderImpl.class);
private Evaluator myResult = null;
private PsiClass myContextPsiClass;

2
java/debugger/impl/src/com/intellij/debugger/impl/ClassLoadingUtils.java
View File

@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class ClassLoadingUtils {
public final class ClassLoadingUtils {
private static final int BATCH_SIZE = 4096;
private ClassLoadingUtils() {}

4
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.impl;
import com.intellij.debugger.*;
@@ -59,7 +59,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
public class DebuggerSession implements AbstractDebuggerSession {
public final class DebuggerSession implements AbstractDebuggerSession {
private static final Logger LOG = Logger.getInstance(DebuggerSession.class);
// flags
private final MyDebuggerStateManager myContextManager;

2
java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
View File

@@ -39,7 +39,7 @@ import org.jetbrains.annotations.TestOnly;
import java.util.List;
public class SourceCodeChecker {
public final class SourceCodeChecker {
private static final Logger LOG = Logger.getInstance(SourceCodeChecker.class);
private SourceCodeChecker() {

2
java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaAttachDebuggerProvider.java
View File

@@ -428,7 +428,7 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
}
}
private static class ProcessAttachDebugExecutor extends DefaultDebugExecutor {
private static final class ProcessAttachDebugExecutor extends DefaultDebugExecutor {
static ProcessAttachDebugExecutor INSTANCE = new ProcessAttachDebugExecutor();
private ProcessAttachDebugExecutor() {

6
java/debugger/impl/src/com/intellij/debugger/jdi/JvmtiError.java
View File

@@ -1,13 +1,11 @@
/*
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.jdi;
/**
* Copied from jvmti.h
* @author egor
*/
public class JvmtiError {
public final class JvmtiError {
private JvmtiError() {
}

2
java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
View File

@@ -22,7 +22,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
public class MethodBytecodeUtil {
public final class MethodBytecodeUtil {
private MethodBytecodeUtil() { }
/**

4
java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentCapabilities.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.memory.agent;
import org.jetbrains.annotations.NotNull;
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.EnumSet;
import java.util.Set;
public class MemoryAgentCapabilities {
public final class MemoryAgentCapabilities {
static final MemoryAgentCapabilities DISABLED = new MemoryAgentCapabilities(false, EnumSet.noneOf(Capability.class));
private final boolean myIsLoaded;

18
java/debugger/impl/src/com/intellij/debugger/memory/filtering/CheckingResultImpl.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.memory.filtering;
import com.intellij.openapi.util.text.StringUtil;
@@ -21,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author Vitaliy.Bibaev
*/
public class CheckingResultImpl implements CheckingResult {
public final class CheckingResultImpl implements CheckingResult {
public static final CheckingResult SUCCESS = new CheckingResultImpl(CheckingResultImpl.Result.MATCH, "");
public static final CheckingResult FAIL = new CheckingResultImpl(CheckingResultImpl.Result.NO_MATCH, "");

4
java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.java
View File

@@ -294,7 +294,7 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
return IntStreamEx.of(table.getSelectedRows()).map(table::convertRowIndexToModel).mapToObj(myTableModel::get);
}
private static class MyTableModel extends AbstractTableModel implements ItemRemovable {
private static final class MyTableModel extends AbstractTableModel implements ItemRemovable {
public static final int ENABLED_COLUMN = 0;
public static final int CLASS_COLUMN = 1;
public static final int METHOD_COLUMN = 2;
@@ -580,7 +580,7 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
.toList();
}
private class AsyncAnnotationsDialog extends DialogWrapper {
private final class AsyncAnnotationsDialog extends DialogWrapper {
private final AnnotationsPanel myAsyncSchedulePanel;
private final AnnotationsPanel myAsyncExecutePanel;
private final DebuggerProjectSettings mySettings;

4
java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java
View File

@@ -541,8 +541,8 @@ class CompoundRendererConfigurable extends JPanel {
}
}
}
private static class ClassNameEditorWithBrowseButton extends ReferenceEditorWithBrowseButton {
private static final class ClassNameEditorWithBrowseButton extends ReferenceEditorWithBrowseButton {
private ClassNameEditorWithBrowseButton(ActionListener browseActionListener, final Project project) {
super(browseActionListener, project,
s -> {

2
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
View File

@@ -428,7 +428,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
return labelRenderer;
}
private static class MapEntryLabelRenderer extends ReferenceRenderer
private static final class MapEntryLabelRenderer extends ReferenceRenderer
implements ValueLabelRenderer, XValuePresentationProvider, OnDemandRenderer {
private static final Key<ValueDescriptorImpl> KEY_DESCRIPTOR = Key.create("KEY_DESCRIPTOR");
private static final Key<ValueDescriptorImpl> VALUE_DESCRIPTOR = Key.create("VALUE_DESCRIPTOR");

2
java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java
View File

@@ -319,7 +319,7 @@ public class HotSwapUIImpl extends HotSwapUI {
myAskBeforeHotswap = false;
}
private static class MyCompilationStatusListener implements ProjectTaskListener {
private static final class MyCompilationStatusListener implements ProjectTaskListener {
private final THashSet<File> myOutputRoots;
private final Project myProject;

2
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java
View File

@@ -444,7 +444,7 @@ public abstract class Breakpoint<P extends JavaBreakpointProperties> implements
return true;
}
private static class EvaluatorCache {
private static final class EvaluatorCache {
private final PsiElement myContext;
private final TextWithImports myTextWithImports;
private final ExpressionEvaluator myEvaluator;

2
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracer.java
View File

@@ -184,7 +184,7 @@ public class CallTracer implements OverheadProducer {
return tracer;
}
private class ThreadRequest {
private final class ThreadRequest {
private final List<MethodEntryRequest> myEntryRequests = new ArrayList<>(1);
private final int myStartIndent;

2
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/InstrumentationTracker.java
View File

@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
public class InstrumentationTracker {
public final class InstrumentationTracker {
private static final Logger LOG = Logger.getInstance(InstrumentationTracker.class);
@SuppressWarnings("FieldCanBeLocal") private final InstrumentationMethodBreakpoint myRedefineBreakpoint;

2
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
View File

@@ -187,7 +187,7 @@ public class ArrayRenderer extends NodeRendererImpl{
}
}
private static class ArrayValuesCache {
private static final class ArrayValuesCache {
private final ArrayReference myArray;
private List<Value> myCachedValues = Collections.emptyList();
private int myCachedStartIndex;

2
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java
View File

@@ -24,7 +24,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
public class BatchEvaluator {
public final class BatchEvaluator {
private static final Logger LOG = Logger.getInstance(BatchEvaluator.class);
private final DebugProcess myDebugProcess;

2
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java
View File

@@ -209,7 +209,7 @@ public class CompoundReferenceRenderer extends NodeRendererImpl implements FullV
renderer == myRendererSettings.getArrayRenderer();
}
private static class AutoToStringRenderer extends ToStringRenderer {
private static final class AutoToStringRenderer extends ToStringRenderer {
private AutoToStringRenderer() {
setIsApplicableChecker(type -> CompletableFuture.completedFuture(type instanceof ReferenceType));
}

18
java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger;
import com.intellij.DynamicBundle;
@@ -24,7 +10,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class JavaDebuggerBundle extends DynamicBundle {
public final class JavaDebuggerBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.JavaDebuggerBundle";
private static final JavaDebuggerBundle INSTANCE = new JavaDebuggerBundle();

18
java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.debugger.engine.evaluation;
import com.intellij.debugger.JavaDebuggerBundle;
@@ -22,7 +8,7 @@ import com.sun.jdi.*;
/**
* @author lex
*/
public class EvaluateExceptionUtil {
public final class EvaluateExceptionUtil {
public static final EvaluateException INCONSISTEND_DEBUG_INFO = createEvaluateException(
JavaDebuggerBundle.message("evaluation.error.inconsistent.debug.info"));
public static final EvaluateException BOOLEAN_EXPECTED = createEvaluateException(

4
java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRunNoErrorCheck.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.options;
import com.intellij.execution.BeforeRunTask;
@@ -61,7 +61,7 @@ public class CompileStepBeforeRunNoErrorCheck
return CompileStepBeforeRun.doMake(myProject, configuration, env, true);
}
public static class MakeBeforeRunTaskNoErrorCheck extends BeforeRunTask<MakeBeforeRunTaskNoErrorCheck> {
public static final class MakeBeforeRunTaskNoErrorCheck extends BeforeRunTask<MakeBeforeRunTaskNoErrorCheck> {
private MakeBeforeRunTaskNoErrorCheck() {
super(ID);
}

2
java/execution/impl/src/com/intellij/execution/application/ClassEditorField.java
View File

@@ -24,7 +24,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
public class ClassEditorField extends EditorTextField {
public final class ClassEditorField extends EditorTextField {
public static ClassEditorField createClassField(Project project, Computable<? extends Module> moduleSelector) {
PsiElement defaultPackage = JavaPsiFacade.getInstance(project).findPackage("");

4
java/execution/impl/src/com/intellij/execution/jshell/DropJShellStateAction.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.jshell;
import com.intellij.execution.ExecutionBundle;
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author Eugene Zhuravlev
*/
class DropJShellStateAction extends AnAction{
final class DropJShellStateAction extends AnAction{
private static final Logger LOG = Logger.getInstance(ExecuteJShellAction.class);
private static class Holder {
private static final AnAction ourInstance = new DropJShellStateAction();

4
java/execution/impl/src/com/intellij/execution/jshell/ExecuteJShellAction.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.jshell;
import com.intellij.icons.AllIcons;
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
/**
* @author Eugene Zhuravlev
*/
class ExecuteJShellAction extends AnAction{
final class ExecuteJShellAction extends AnAction{
private static class Holder {
private static final AnAction ourInstance = new ExecuteJShellAction();
}

4
java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.jshell;
import com.intellij.execution.ExecutionBundle;
@@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* @author Eugene Zhuravlev
*/
public class JShellHandler {
public final class JShellHandler {
private static final Logger LOG = Logger.getInstance(JShellHandler.class);
private static final int DEBUG_PORT = -1;
public static final Key<JShellHandler> MARKER_KEY = Key.create("JShell console key");

4
java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTreeModel.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.testDiscovery.actions;
import com.intellij.ide.util.JavaAnonymousClassesHelper;
@@ -141,7 +141,7 @@ class DiscoveredTestsTreeModel extends BaseTreeModel<Object> {
}
}
static class Method extends Node<PsiMethod> {
static final class Method extends Node<PsiMethod> {
private final Collection<String> myParameters = new THashSet<>();
private Method(@NotNull PsiMethod method) {

18
java/execution/impl/src/com/intellij/execution/testframework/JavaAwareFilter.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.testframework;
import com.intellij.execution.Location;
@@ -26,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author anna
*/
public class JavaAwareFilter {
public final class JavaAwareFilter {
private JavaAwareFilter() { }
public static Filter METHOD(@NotNull final Project project, @NotNull final GlobalSearchScope searchScope) {

2
java/execution/impl/src/com/intellij/execution/util/JavaParametersUtil.java
View File

@@ -35,7 +35,7 @@ import java.util.Map;
/**
* @author lex
*/
public class JavaParametersUtil {
public final class JavaParametersUtil {
private JavaParametersUtil() { }
public static void configureConfiguration(SimpleJavaParameters parameters, CommonJavaRunConfigurationParameters configuration) {

4
java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.configurations;
import com.intellij.execution.CantRunException;
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus;
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
@SuppressWarnings("unused")
public class CommandLineBuilder {
public final class CommandLineBuilder {
private CommandLineBuilder() { }
public static GeneralCommandLine createFromJavaParameters(final SimpleJavaParameters javaParameters) throws CantRunException {

20
java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.configurations;
import com.intellij.execution.ExecutionException;
@@ -21,14 +7,14 @@ import com.intellij.execution.process.ProcessHandlerFactory;
import com.intellij.execution.process.ProcessTerminatedListener;
import org.jetbrains.annotations.NotNull;
public class JavaCommandLineStateUtil {
public final class JavaCommandLineStateUtil {
private JavaCommandLineStateUtil() { }
@NotNull
public static OSProcessHandler startProcess(@NotNull GeneralCommandLine commandLine) throws ExecutionException {
return startProcess(commandLine, false);
}
@NotNull
public static OSProcessHandler startProcess(@NotNull GeneralCommandLine commandLine, boolean ansiColoring) throws ExecutionException {
ProcessHandlerFactory factory = ProcessHandlerFactory.getInstance();

4
java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilters.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.filters;
import com.intellij.psi.search.GlobalSearchScope;
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class ExceptionFilters {
public final class ExceptionFilters {
private ExceptionFilters() {
}

4
java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.facet.impl.ui.actions;
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
public class AddFacetToModuleAction extends AnAction implements DumbAware {
public final class AddFacetToModuleAction extends AnAction implements DumbAware {
private static final Logger LOG = Logger.getInstance(AddFacetToModuleAction.class);
private final FacetEditorFacade myEditor;
private final Project myProject;

18
java/idea-ui/src/com/intellij/framework/addSupport/FrameworkSupportInModuleProvider.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.framework.addSupport;
import com.intellij.diagnostic.PluginException;
@@ -97,7 +83,7 @@ public abstract class FrameworkSupportInModuleProvider implements FrameworkOrGro
return getPresentableName();
}
public static class FrameworkDependency {
public static final class FrameworkDependency {
private final String myFrameworkId;
private final boolean myOptional;

2
java/idea-ui/src/com/intellij/ide/JavaUiBundle.java
View File

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class JavaUiBundle extends DynamicBundle {
public final class JavaUiBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.JavaUiBundle";
private static final JavaUiBundle INSTANCE = new JavaUiBundle();

4
java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.frameworkSupport;
import com.intellij.facet.impl.DefaultFacetsProvider;
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
public class AddFrameworkSupportDialog extends DialogWrapper {
public final class AddFrameworkSupportDialog extends DialogWrapper {
private final AddSupportForFrameworksPanel myAddSupportPanel;
private final Module myModule;

2
java/idea-ui/src/com/intellij/ide/util/importProject/JavaModuleInsight.java
View File

@@ -253,7 +253,7 @@ public final class JavaModuleInsight extends ModuleInsight {
return root instanceof JavaModuleSourceRoot;
}
private static class ModuleInfo {
private static final class ModuleInfo {
final String name;
final Set<String> requiresModules = new HashSet<>();
final Set<String> exportsPackages = new HashSet<>();

2
java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
View File

@@ -131,7 +131,7 @@ public abstract class ModuleInsight {
addModules(contentRootToModules.values());
}
private static class ModuleCandidate {
private static final class ModuleCandidate {
final List<DetectedSourceRoot> myRoots = new ArrayList<>();
@NotNull File myFolder;

8
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
View File

@@ -315,7 +315,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
};
}
private class MergeAction extends AnAction {
private final class MergeAction extends AnAction {
private MergeAction() {
super(CommonBundle.messagePointer("action.text.merge"), () -> "", AllIcons.Vcs.Merge); // todo
}
@@ -349,7 +349,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
}
private class SplitAction extends AnAction {
private final class SplitAction extends AnAction {
private SplitAction() {
super(CommonBundle.messagePointer("action.text.split"), () -> "", AllIcons.Modules.Split); // todo
}
@@ -386,7 +386,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
}
}
private class RenameAction extends AnAction {
private final class RenameAction extends AnAction {
private RenameAction() {
super(CommonBundle.messagePointer("action.text.rename"), () -> "", IconUtil.getEditIcon()); // todo
}
@@ -427,7 +427,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
}
}
private class SplitDialog extends DialogWrapper {
private final class SplitDialog extends DialogWrapper {
final JTextField myNameField;
final ElementsChooser<File> myChooser;

18
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworksTree.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.newProjectWizard;
import com.intellij.framework.FrameworkOrGroup;
@@ -95,7 +81,7 @@ public class FrameworksTree extends CheckboxTree {
return myProcessingMouseEventOnCheckbox;
}
private static class FrameworksTreeRenderer extends CheckboxTreeCellRenderer {
private static final class FrameworksTreeRenderer extends CheckboxTreeCellRenderer {
private final FrameworkSupportModelBase myModel;
private FrameworksTreeRenderer(FrameworkSupportModelBase model) {

18
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/OldFrameworkSupportProviderWrapper.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.newProjectWizard;
import com.intellij.framework.FrameworkTypeEx;
@@ -83,7 +69,7 @@ public class OldFrameworkSupportProviderWrapper extends FrameworkSupportInModule
return myProvider.getRoles();
}
public static class FrameworkSupportProviderBasedType extends FrameworkTypeEx {
public static final class FrameworkSupportProviderBasedType extends FrameworkTypeEx {
private final FrameworkSupportProvider myOldProvider;
private final OldFrameworkSupportProviderWrapper myNewProvider;

2
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java
View File

@@ -14,7 +14,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
public class ProjectWizardUtil {
public final class ProjectWizardUtil {
private ProjectWizardUtil() { }
public static String findNonExistingFileName(String searchDirectory, String preferredName, String extension) {

18
java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/JavaSourceRootDetectionUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.projectWizard.importSources;
import com.intellij.ide.util.importProject.RootDetectionProcessor;
@@ -34,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class JavaSourceRootDetectionUtil {
public final class JavaSourceRootDetectionUtil {
private static final TokenSet JAVA_FILE_FIRST_TOKEN_SET = TokenSet.orSet(
ElementType.MODIFIER_BIT_SET,
ElementType.CLASS_KEYWORD_BIT_SET,

18
java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/ProjectStructureDetector.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.projectWizard.importSources;
import com.intellij.ide.util.importProject.ProjectDescriptor;
@@ -77,7 +63,7 @@ public abstract class ProjectStructureDetector {
@NotNull ProjectFromSourcesBuilder builder) {
}
public static class DirectoryProcessingResult {
public static final class DirectoryProcessingResult {
private final boolean myProcessChildren;
private final File myParentToSkip;
public static final DirectoryProcessingResult PROCESS_CHILDREN = new DirectoryProcessingResult(true, null);

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
View File

@@ -158,7 +158,7 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL
}
}
private static class ClasspathFormatPanel extends JPanel {
private static final class ClasspathFormatPanel extends JPanel {
private final @NotNull ModuleConfigurationState myState;
private final JComboBox<String> comboBoxClasspathFormat;

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaResourceRootEditHandlerBase.java
View File

@@ -87,7 +87,7 @@ public abstract class JavaResourceRootEditHandlerBase extends ModuleSourceRootEd
return panel;
}
private static class ResourceRootPropertiesDialog extends DialogWrapper {
private static final class ResourceRootPropertiesDialog extends DialogWrapper {
private final JTextField myRelativeOutputPathField;
private final JCheckBox myIsGeneratedCheckBox;
private final JPanel myMainPanel;

18
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaVfsSourceRootDetectionUtil.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.roots.ui.configuration;
import com.intellij.ide.highlighter.JavaFileType;
@@ -34,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class JavaVfsSourceRootDetectionUtil {
public final class JavaVfsSourceRootDetectionUtil {
private JavaVfsSourceRootDetectionUtil() {}
/**

6
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.roots.ui.configuration;
import com.intellij.ide.JavaUiBundle;
@@ -379,7 +379,7 @@ public class JdkComboBox extends SdkComboBoxBase<JdkComboBoxItem> {
}
}
private static class InnerJdkComboBoxItem extends JdkComboBoxItem implements InnerComboBoxItem {
private static final class InnerJdkComboBoxItem extends JdkComboBoxItem implements InnerComboBoxItem {
private final SdkListItem myItem;
private InnerJdkComboBoxItem(@NotNull SdkListItem item) {
@@ -406,7 +406,7 @@ public class JdkComboBox extends SdkComboBoxBase<JdkComboBoxItem> {
}
}
private static class ActualJdkInnerItem extends ActualJdkComboBoxItem implements InnerComboBoxItem {
private static final class ActualJdkInnerItem extends ActualJdkComboBoxItem implements InnerComboBoxItem {
private final SdkItem myItem;
private ActualJdkInnerItem(@NotNull SdkItem item) {

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java
View File

@@ -109,7 +109,7 @@ public class ArtifactPropertiesEditors {
return null;
}
private class PropertiesEditorInfo {
private final class PropertiesEditorInfo {
private final ArtifactPropertiesEditor myEditor;
private final ArtifactProperties<?> myProperties;
private final ArtifactPropertiesProvider myProvider;

6
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
View File

@@ -1,6 +1,4 @@
/*
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.roots.ui.configuration.artifacts;
import com.intellij.CommonBundle;
@@ -385,7 +383,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
}
}
private class CopyArtifactAction extends AnAction {
private final class CopyArtifactAction extends AnAction {
private CopyArtifactAction() {
super(CommonBundle.messagePointer("button.copy"), CommonBundle.messagePointer("button.copy"), COPY_ICON);
}

4
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/InvalidArtifactConfigurable.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.roots.ui.configuration.artifacts;
import com.intellij.icons.AllIcons;
@@ -41,7 +41,7 @@ public class InvalidArtifactConfigurable extends ArtifactConfigurableBase {
public void apply() throws ConfigurationException {
}
private static class InvalidArtifactComponent {
private static final class InvalidArtifactComponent {
private JPanel myMainPanel;
private MultiLineLabel myDescriptionLabel;
private JLabel myIconLabel;

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeComponent.java
View File

@@ -557,7 +557,7 @@ public class LayoutTreeComponent implements DnDTarget, Disposable {
return mySortElements;
}
private class SelectedElementInfo<E extends PackagingElement<?>> {
private final class SelectedElementInfo<E extends PackagingElement<?>> {
private final E myElement;
private PackagingElementPropertiesPanel myCurrentPanel;

Some files were not shown because too many files have changed in this diff Show More