MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

i18n: @NonNls return type of AbstractModuleBuilder#getBuilderId

Browse Source 
GitOrigin-RevId: 942680ec425928d93219bff125cfd79d0dcb18be
This commit is contained in:
Daniil Ovchinnikov
2020-08-17 21:17:32 +03:00
committed by intellij-monorepo-bot
parent 0ffc7caa8a
commit 468269f9e3
8 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
View File

@@ -353,7 +353,7 @@ public class MarkerType {
if (inheritors.isEmpty()) return;
final SubclassUpdater subclassUpdater = new SubclassUpdater(aClass, renderer);
inheritors.sort(renderer.getComparator());
PsiElementListNavigator.openTargets(e, inheritors.toArray(NavigatablePsiElement.EMPTY_NAVIGATABLE_ELEMENT_ARRAY),
PsiElementListNavigator.openTargets(e, inheritors.toArray(NavigatablePsiElement.EMPTY_NAVIGATABLE_ELEMENT_ARRAY),
subclassUpdater.getCaption(inheritors.size()), CodeInsightBundle.message("goto.implementation.findUsages.title", aClass.getName()), renderer, subclassUpdater);
}

7
java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.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.remoteServer.impl.module;
import com.intellij.icons.AllIcons;
@@ -16,9 +16,10 @@ import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.remoteServer.CloudBundle;
import com.intellij.remoteServer.ServerType;
import com.intellij.remoteServer.configuration.RemoteServer;
import com.intellij.remoteServer.CloudBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -58,7 +59,7 @@ public class CloudModuleBuilder extends JavaModuleBuilder {
}
@Override
public String getBuilderId() {
public @NonNls String getBuilderId() {
return getClass().getName();
}

5
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.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.externalSystem.service.project.wizard;
import com.intellij.ide.util.projectWizard.ModuleBuilder;
@@ -9,6 +9,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemBundle;
import com.intellij.openapi.externalSystem.util.ExternalSystemUiUtil;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -32,7 +33,7 @@ public abstract class AbstractExternalModuleBuilder<S extends ExternalProjectSet
}
@Override
public String getBuilderId() {
public @NonNls String getBuilderId() {
return getClass().getName();
}

4
platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.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.projectWizard;
import com.intellij.openapi.Disposable;
@@ -17,7 +17,7 @@ public abstract class AbstractModuleBuilder extends ProjectBuilder {
public abstract Icon getNodeIcon();
@Nullable
public abstract String getBuilderId();
public abstract @NonNls String getBuilderId();
public abstract ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider);

2
platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
View File

@@ -102,7 +102,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
@Override
@Nullable
public String getBuilderId() {
public @NonNls String getBuilderId() {
ModuleType<?> moduleType = getModuleType();
return moduleType == null ? null : moduleType.getId();
}

3
platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
View File

@@ -47,6 +47,7 @@ import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import org.apache.velocity.exception.VelocityException;
import org.jdom.JDOMException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.model.serialization.PathMacroUtil;
@@ -140,7 +141,7 @@ public class TemplateModuleBuilder extends ModuleBuilder {
@NotNull
@Override
public String getBuilderId() {
public @NonNls String getBuilderId() {
return myTemplate.getName();
}

19
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.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.jetbrains.plugins.groovy.config;
import com.intellij.ide.util.projectWizard.JavaModuleBuilder;
@@ -21,6 +7,7 @@ import com.intellij.ide.util.projectWizard.SettingsStep;
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import icons.JetgroovyIcons;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.mvc.GroovySdkForNewModuleWizardStep;
@@ -59,7 +46,7 @@ public class GroovyAwareModuleBuilder extends JavaModuleBuilder {
}
@Override
public String getBuilderId() {
public @NonNls String getBuilderId() {
return myBuilderId;
}

5
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/AbstractMavenModuleBuilder.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 org.jetbrains.idea.maven.wizards;
import com.intellij.ide.util.projectWizard.*;
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.model.MavenArchetype;
@@ -76,7 +77,7 @@ public abstract class AbstractMavenModuleBuilder extends ModuleBuilder implement
}
@Override
public String getBuilderId() {
public @NonNls String getBuilderId() {
return getClass().getName();
}