From 8d4324e8e82615987e070c1c495c3434a3cdbde2 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Fri, 25 Oct 2013 20:56:00 +0400 Subject: [PATCH] Minor changes: remove unnecessary qualifier. --- .../repositories/MavenRepositoryConverter.java | 3 ++- .../maven/dom/generate/GenerateParentAction.java | 3 ++- .../dom/references/MavenPropertyPsiReference.java | 13 +++++++------ .../dom/references/MavenPsiElementWrapper.java | 3 ++- .../idea/maven/tasks/MavenKeymapExtension.java | 7 ++++--- .../maven/utils/MavenFileTemplateGroupFactory.java | 9 +++++---- .../org/jetbrains/idea/maven/utils/MavenUIUtil.java | 3 ++- .../maven/utils/library/RepositoryLibraryType.java | 3 ++- .../wizards/MavenFrameworkSupportProvider.java | 3 ++- 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/repositories/MavenRepositoryConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/repositories/MavenRepositoryConverter.java index 46fa023da939..b85120a5f881 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/repositories/MavenRepositoryConverter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/repositories/MavenRepositoryConverter.java @@ -25,6 +25,7 @@ import com.intellij.psi.impl.UrlPsiReference; import com.intellij.util.xml.ConvertContext; import com.intellij.util.xml.GenericDomValue; import com.intellij.util.xml.ResolvingConverter; +import icons.MavenIcons; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,7 +53,7 @@ public abstract class MavenRepositoryConverter extends ResolvingConverter() { @Override public Object process(@NotNull String property, XmlElementDescriptor descriptor) { if (property.startsWith("project.")) { - addVariant(result, property.substring("project.".length()), descriptor, prefix, icons.MavenIcons.MavenLogo); + addVariant(result, property.substring("project.".length()), descriptor, prefix, MavenIcons.MavenLogo); } return null; } @@ -363,7 +364,7 @@ public class MavenPropertyPsiReference extends MavenPsiReference { processSchema(MavenSchemaProvider.MAVEN_SETTINGS_SCHEMA_URL, new SchemaProcessor(){ @Override public Object process(@NotNull String property, XmlElementDescriptor descriptor) { - result.add(createLookupElement(descriptor, property, icons.MavenIcons.MavenLogo)); + result.add(createLookupElement(descriptor, property, MavenIcons.MavenLogo)); return null; } }); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiElementWrapper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiElementWrapper.java index b2c41dea7de5..a07612037b17 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiElementWrapper.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiElementWrapper.java @@ -20,6 +20,7 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.impl.RenameableFakePsiElement; +import icons.MavenIcons; import javax.swing.*; @@ -56,7 +57,7 @@ public class MavenPsiElementWrapper extends RenameableFakePsiElement { } public Icon getIcon() { - return icons.MavenIcons.MavenLogo; + return MavenIcons.MavenLogo; } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java index 13545fb5f368..7bde42d519e1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java @@ -22,6 +22,7 @@ import com.intellij.openapi.keymap.KeymapGroupFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; +import icons.MavenIcons; import org.jetbrains.annotations.TestOnly; import org.jetbrains.idea.maven.execution.MavenRunConfigurationType; import org.jetbrains.idea.maven.execution.MavenRunnerParameters; @@ -39,7 +40,7 @@ import java.util.*; public class MavenKeymapExtension implements KeymapExtension { public KeymapGroup createGroup(Condition condition, Project project) { KeymapGroup result = KeymapGroupFactory.getInstance().createGroup(TasksBundle.message("maven.tasks.action.group.name"), - icons.MavenIcons.PhasesClosed + MavenIcons.PhasesClosed ); if (project == null) return result; @@ -83,7 +84,7 @@ public class MavenKeymapExtension implements KeymapExtension { Set> goalsToActionIds = each.getValue(); if (goalsToActionIds.isEmpty()) continue; KeymapGroup group = KeymapGroupFactory.getInstance().createGroup(mavenProject.getDisplayName(), - icons.MavenIcons.PhasesClosed + MavenIcons.PhasesClosed ); result.addGroup(group); for (Pair eachGoalToActionId : goalsToActionIds) { @@ -170,7 +171,7 @@ public class MavenKeymapExtension implements KeymapExtension { myGoal = goal; Presentation template = getTemplatePresentation(); template.setText(goal, false); - template.setIcon(icons.MavenIcons.Phase); + template.setIcon(MavenIcons.Phase); } public void actionPerformed(AnActionEvent e) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenFileTemplateGroupFactory.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenFileTemplateGroupFactory.java index 60913d1e6b4c..21a17d969712 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenFileTemplateGroupFactory.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenFileTemplateGroupFactory.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.utils; import com.intellij.ide.fileTemplates.FileTemplateDescriptor; import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor; import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory; +import icons.MavenIcons; public class MavenFileTemplateGroupFactory implements FileTemplateGroupDescriptorFactory { public static final String MAVEN_PROJECT_XML_TEMPLATE = "Maven Project.xml"; @@ -25,11 +26,11 @@ public class MavenFileTemplateGroupFactory implements FileTemplateGroupDescripto public static final String MAVEN_SETTINGS_XML_TEMPLATE = "Maven Settings.xml"; public FileTemplateGroupDescriptor getFileTemplatesDescriptor() { - FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor("Maven", icons.MavenIcons.MavenLogo); + FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor("Maven", MavenIcons.MavenLogo); - group.addTemplate(new FileTemplateDescriptor(MAVEN_PROJECT_XML_TEMPLATE, icons.MavenIcons.MavenLogo)); - group.addTemplate(new FileTemplateDescriptor(MAVEN_PROFILES_XML_TEMPLATE, icons.MavenIcons.MavenLogo)); - group.addTemplate(new FileTemplateDescriptor(MAVEN_SETTINGS_XML_TEMPLATE, icons.MavenIcons.MavenLogo)); + group.addTemplate(new FileTemplateDescriptor(MAVEN_PROJECT_XML_TEMPLATE, MavenIcons.MavenLogo)); + group.addTemplate(new FileTemplateDescriptor(MAVEN_PROFILES_XML_TEMPLATE, MavenIcons.MavenLogo)); + group.addTemplate(new FileTemplateDescriptor(MAVEN_SETTINGS_XML_TEMPLATE, MavenIcons.MavenLogo)); return group; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java index ff51492b2ac9..df962236ff9e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java @@ -32,6 +32,7 @@ import java.awt.*; import java.awt.event.*; import java.util.Collection; import java.util.Comparator; +import java.util.List; import java.util.TreeSet; public class MavenUIUtil { @@ -50,7 +51,7 @@ public class MavenUIUtil { } public static void setElements(ElementsChooser chooser, Collection all, Collection selected, Comparator comparator) { - java.util.List selection = chooser.getSelectedElements(); + List selection = chooser.getSelectedElements(); chooser.clear(); Collection sorted = new TreeSet(comparator); sorted.addAll(all); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java index 987be00c6b07..b1145f4eb747 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java @@ -22,6 +22,7 @@ import com.intellij.openapi.roots.libraries.PersistentLibraryKind; import com.intellij.openapi.roots.libraries.ui.LibraryEditorComponent; import com.intellij.openapi.roots.libraries.ui.LibraryPropertiesEditor; import com.intellij.openapi.vfs.VirtualFile; +import icons.MavenIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -72,6 +73,6 @@ public class RepositoryLibraryType extends LibraryType