MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes: remove unnecessary qualifier.

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-10-25 20:57:14 +04:00
parent ab17b2ce74
commit 8d4324e8e8
9 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/repositories/MavenRepositoryConverter.java
+2 -1
View File
@@ -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<String
@Override
public LookupElement createLookupElement(String s) {
return LookupElementBuilder.create(s)
.withIcon(icons.MavenIcons.MavenPlugin)
.withIcon(MavenIcons.MavenPlugin)
.withTailText(" (" + MavenRepositoriesProvider.getInstance().getRepositoryUrl(s) + ")", true);
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateParentAction.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.util.xml.DomUtil;
import com.intellij.util.xml.ui.actions.generate.GenerateDomElementAction;
import icons.MavenIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.dom.MavenDomBundle;
import org.jetbrains.idea.maven.dom.MavenDomUtil;
@@ -49,7 +50,7 @@ public class GenerateParentAction extends GenerateDomElementAction {
protected boolean isAvailableForModel(MavenDomProjectModel mavenModel) {
return !DomUtil.hasXml(mavenModel.getMavenParent());
}
}, icons.MavenIcons.MavenProject);
}, MavenIcons.MavenProject);
}
@Override
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
+7 -6
View File
@@ -37,6 +37,7 @@ import com.intellij.util.xml.DomUtil;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlNSDescriptor;
import gnu.trove.THashSet;
import icons.MavenIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.dom.MavenDomProjectProcessorUtils;
@@ -343,18 +344,18 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
final String prefix = prefixLength == 0 ? null : myText.substring(0, prefixLength);
PsiDirectory baseDir = getBaseDir(mavenProject);
addVariant(result, "basedir", baseDir, prefix, icons.MavenIcons.MavenLogo);
addVariant(result, "basedir", baseDir, prefix, MavenIcons.MavenLogo);
if (prefix == null) {
result.add(createLookupElement(baseDir, "project.baseUri", icons.MavenIcons.MavenLogo));
result.add(createLookupElement(baseDir, "pom.baseUri", icons.MavenIcons.MavenLogo));
result.add(LookupElementBuilder.create(TIMESTAMP_PROP).withIcon(icons.MavenIcons.MavenLogo));
result.add(createLookupElement(baseDir, "project.baseUri", MavenIcons.MavenLogo));
result.add(createLookupElement(baseDir, "pom.baseUri", MavenIcons.MavenLogo));
result.add(LookupElementBuilder.create(TIMESTAMP_PROP).withIcon(MavenIcons.MavenLogo));
}
processSchema(MavenSchemaProvider.MAVEN_PROJECT_SCHEMA_URL, new SchemaProcessor<Object>() {
@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<Object>(){
@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;
}
});
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiElementWrapper.java
+2 -1
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java
+4 -3
View File
@@ -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<AnAction> 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<Pair<String, String>> goalsToActionIds = each.getValue();
if (goalsToActionIds.isEmpty()) continue;
KeymapGroup group = KeymapGroupFactory.getInstance().createGroup(mavenProject.getDisplayName(),
icons.MavenIcons.PhasesClosed
MavenIcons.PhasesClosed
);
result.addGroup(group);
for (Pair<String, String> 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) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenFileTemplateGroupFactory.java
+5 -4
View File
@@ -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;
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java
+2 -1
View File
@@ -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 <E> void setElements(ElementsChooser<E> chooser, Collection<E> all, Collection<E> selected, Comparator<E> comparator) {
java.util.List<E> selection = chooser.getSelectedElements();
List<E> selection = chooser.getSelectedElements();
chooser.clear();
Collection<E> sorted = new TreeSet<E>(comparator);
sorted.addAll(all);
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java
+2 -1
View File
@@ -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<RepositoryLibraryProperti
@Override
public Icon getIcon() {
return icons.MavenIcons.MavenLogo;
return MavenIcons.MavenLogo;
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import icons.MavenIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.model.MavenConstants;
@@ -116,6 +117,6 @@ public class MavenFrameworkSupportProvider extends FrameworkSupportProvider {
@Override
public Icon getIcon() {
return icons.MavenIcons.MavenLogo;
return MavenIcons.MavenLogo;
}
}