moving ant-related icons under ant plugin; IDEA-34889 Provide dedicated icon for ANT build.xml files

This commit is contained in:
Eugene Zhuravlev
2013-11-12 20:03:56 +01:00
parent 3c69bd1a12
commit 5c14653dac
66 changed files with 90 additions and 241 deletions
+26
View File
@@ -255,6 +255,32 @@
<codeStyleSettings language="SQL">
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
+1 -1
View File
@@ -5,7 +5,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/"/>
<root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/" />
</SOURCES>
</library>
</component>
+2 -2
View File
@@ -173,6 +173,8 @@
<module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/openapi/xml-openapi.iml" filepath="$PROJECT_DIR$/xml/openapi/xml-openapi.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" filepath="$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" filepath="$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" group="xml" />
@@ -182,8 +184,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
</modules>
</component>
</project>
@@ -93,7 +93,6 @@ public interface PlatformIcons {
Icon OPEN_EDIT_DIALOG_ICON = AllIcons.Actions.ShowViewer;
Icon FLATTEN_PACKAGES_ICON = AllIcons.ObjectBrowser.FlattenPackages;
Icon EDIT_IN_SECTION_ICON = AllIcons.General.EditItemInSection;
Icon TASK_ICON = AllIcons.Ant.Task;
Icon CLASS_INITIALIZER = AllIcons.Nodes.ClassInitializer;
Icon CLOSED_MODULE_GROUP_ICON = AllIcons.Nodes.ModuleGroup;

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 516 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 512 B

After

Width:  |  Height:  |  Size: 512 B

@@ -181,7 +181,7 @@ public class ChooseActionsDialog extends DialogWrapper {
group.add(new AnAction(KeyMapBundle.message("filter.shortcut.action.text"),
KeyMapBundle.message("filter.shortcut.action.text"),
AllIcons.Ant.ShortcutFilter) {
AllIcons.Actions.ShortcutFilter) {
public void actionPerformed(AnActionEvent e) {
myFilterComponent.reset();
if (myPopup == null || myPopup.getContent() == null) {
@@ -437,7 +437,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
group.add(new DumbAwareAction(KeyMapBundle.message("filter.shortcut.action.text"),
KeyMapBundle.message("filter.shortcut.action.text"),
AllIcons.Ant.ShortcutFilter) {
AllIcons.Actions.ShortcutFilter) {
public void actionPerformed(AnActionEvent e) {
myFilterComponent.reset();
if (myPopup == null || myPopup.getContent() == null){
@@ -133,6 +133,7 @@ public class AllIcons {
public static final Icon Search = IconLoader.getIcon("/actions/search.png"); // 16x16
public static final Icon Selectall = IconLoader.getIcon("/actions/selectall.png"); // 16x16
public static final Icon Share = IconLoader.getIcon("/actions/share.png"); // 14x14
public static final Icon ShortcutFilter = IconLoader.getIcon("/actions/shortcutFilter.png"); // 16x16
public static final Icon ShowAsTree = IconLoader.getIcon("/actions/showAsTree.png"); // 16x16
public static final Icon ShowChangesOnly = IconLoader.getIcon("/actions/showChangesOnly.png"); // 16x16
public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); // 16x16
@@ -161,20 +162,6 @@ public class AllIcons {
}
public static class Ant {
public static final Icon AntInstallation = IconLoader.getIcon("/ant/antInstallation.png"); // 16x16
public static final Icon Build = IconLoader.getIcon("/ant/build.png"); // 16x16
public static final Icon ChangeView = IconLoader.getIcon("/ant/changeView.png"); // 16x16
public static final Icon Message = IconLoader.getIcon("/ant/message.png"); // 16x16
public static final Icon MetaTarget = IconLoader.getIcon("/ant/metaTarget.png"); // 16x16
public static final Icon Properties = IconLoader.getIcon("/ant/properties.png"); // 16x16
public static final Icon ShortcutFilter = IconLoader.getIcon("/ant/shortcutFilter.png"); // 16x16
public static final Icon Target = IconLoader.getIcon("/ant/target.png"); // 16x16
public static final Icon Task = IconLoader.getIcon("/ant/task.png"); // 16x16
public static final Icon Verbose = IconLoader.getIcon("/ant/verbose.png"); // 16x16
}
public static class Css {
public static final Icon Atrule = IconLoader.getIcon("/css/atrule.png"); // 16x16
public static final Icon Import = IconLoader.getIcon("/css/import.png"); // 16x16
+1
View File
@@ -5,6 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 518 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 518 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 817 B

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 802 B

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 598 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 465 B

Before

Width:  |  Height:  |  Size: 946 B

After

Width:  |  Height:  |  Size: 946 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 483 B

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 555 B

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 368 B

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 446 B

Before

Width:  |  Height:  |  Size: 931 B

After

Width:  |  Height:  |  Size: 931 B

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 332 B

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 949 B

Before

Width:  |  Height:  |  Size: 499 B

After

Width:  |  Height:  |  Size: 499 B

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 992 B

Before

Width:  |  Height:  |  Size: 885 B

After

Width:  |  Height:  |  Size: 885 B

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 398 B

@@ -1,52 +0,0 @@
/*
* 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.
*/
package com.intellij.lang.ant;
import com.intellij.icons.AllIcons;
import com.intellij.util.PlatformIcons;
import org.jetbrains.annotations.NonNls;
import javax.swing.*;
/**
* @author dyoma
*/
public enum AntElementRole implements PlatformIcons {
TARGET_ROLE(AntBundle.message("ant.role.ant.target"), AllIcons.Ant.Target),
PROPERTY_ROLE(AntBundle.message("ant.role.ant.property"), PROPERTY_ICON),
TASK_ROLE(AntBundle.message("ant.role.ant.task"), TASK_ICON),
USER_TASK_ROLE(AntBundle.message("ant.element.role.user.task"), TASK_ICON),
PROJECT_ROLE(AntBundle.message("ant.element.role.ant.project.name"), PROPERTY_ICON),
MACRODEF_ROLE(AntBundle.message("ant.element.role.macrodef.element"), TASK_ICON),
SCRIPTDEF_ROLE(AntBundle.message("ant.element.role.scriptdef.element"), TASK_ICON),
@NonNls NULL_ROLE("Ant element", null);
AntElementRole(String name, Icon icon) {
myName = name;
myIcon = icon;
}
private final String myName;
private final Icon myIcon;
public String getName() {
return myName;
}
public Icon getIcon() {
return myIcon;
}
}
@@ -1,57 +0,0 @@
/*
* 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.
*/
package com.intellij.lang.ant;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.fileTypes.LanguageFileType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public class AntFileType extends LanguageFileType {
@NonNls public static final String DEFAULT_EXTENSION = "ant";
@NonNls public static final String DOT_DEFAULT_EXTENSION = ".ant";
public AntFileType() {
super(new AntLanguage());
}
@NotNull
@NonNls
public String getName() {
return "ANT";
}
@NotNull
public String getDescription() {
return IdeBundle.message("filetype.description.ant");
}
@NotNull
@NonNls
public String getDefaultExtension() {
return DEFAULT_EXTENSION;
}
@Nullable
public Icon getIcon() {
return AllIcons.FileTypes.Xml;
}
}
@@ -1,28 +0,0 @@
/*
* 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.
*/
package com.intellij.lang.ant;
import com.intellij.lang.DependentLanguage;
import com.intellij.lang.Language;
import com.intellij.lang.StdLanguages;
public class AntLanguage extends Language implements DependentLanguage{
public AntLanguage() {
super("ANT");
StdLanguages.ANT = this;
}
}
@@ -1,33 +0,0 @@
/*
* 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.
*/
/*
* @author max
*/
package com.intellij.lang.ant;
import com.intellij.lang.refactoring.NamesValidator;
import com.intellij.openapi.project.Project;
public class AntNamesValidator implements NamesValidator {
public boolean isKeyword(String name, Project project) {
return false;
}
public boolean isIdentifier(String name, Project project) {
return true;
}
}
@@ -15,13 +15,13 @@
*/
package com.intellij.lang.ant.config.actions;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.explorer.AntExplorer;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.actionSystem.Presentation;
import icons.AntIcons;
public final class AntBuildFilePropertiesAction extends AnAction {
private final AntExplorer myAntExplorer;
@@ -29,7 +29,7 @@ public final class AntBuildFilePropertiesAction extends AnAction {
public AntBuildFilePropertiesAction(AntExplorer antExplorer) {
super(AntBundle.message("build.file.properties.action.name"),
AntBundle.message("build.file.properties.action.description"),
AllIcons.Ant.Properties);
AntIcons.Properties);
myAntExplorer = antExplorer;
registerCustomShortcutSet(CommonShortcuts.ALT_ENTER, myAntExplorer);
}
@@ -15,17 +15,17 @@
*/
package com.intellij.lang.ant.config.actions;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.execution.AntBuildMessageView;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import icons.AntIcons;
public final class ChangeViewAction extends AnAction {
private final AntBuildMessageView myAntBuildMessageView;
public ChangeViewAction(AntBuildMessageView antBuildMessageView) {
super(AntBundle.message("ant.view.toggle.tree.text.action.name"),null, AllIcons.Ant.ChangeView);
super(AntBundle.message("ant.view.toggle.tree.text.action.name"),null, AntIcons.ChangeView);
myAntBuildMessageView = antBuildMessageView;
}
@@ -15,18 +15,18 @@
*/
package com.intellij.lang.ant.config.actions;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.execution.AntBuildMessageView;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.ToggleAction;
import icons.AntIcons;
public final class VerboseAction extends ToggleAction {
private final AntBuildMessageView myAntBuildMessageView;
public VerboseAction(AntBuildMessageView antBuildMessageView) {
super(AntBundle.message("ant.verbose.show.all.messages.action.name"),
AntBundle.message("ant.verbose.show.all.messages.action.description"), AllIcons.Ant.Verbose);
AntBundle.message("ant.verbose.show.all.messages.action.description"), AntIcons.Verbose);
myAntBuildMessageView = antBuildMessageView;
}
@@ -19,7 +19,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.MultilineTreeCellRenderer;
import com.intellij.ui.SideBorder;
import com.intellij.util.PlatformIcons;
import icons.AntIcons;
import javax.swing.*;
@@ -53,20 +53,20 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer {
MessageNode node = (MessageNode)value;
AntBuildMessageView.MessageType type = node.getType();
if (type == AntBuildMessageView.MessageType.BUILD) {
icon = AllIcons.Ant.Build;
icon = AntIcons.Build;
}
else if (type == AntBuildMessageView.MessageType.TARGET) {
icon = AllIcons.Ant.Target;
icon = AntIcons.Target;
}
else if (type == AntBuildMessageView.MessageType.TASK) {
icon = PlatformIcons.TASK_ICON;
icon = AntIcons.Task;
}
else if (type == AntBuildMessageView.MessageType.MESSAGE) {
if (node.getPriority() == AntBuildMessageView.PRIORITY_WARN) {
icon = AllIcons.General.Warning;
}
else {
icon = AllIcons.Ant.Message;
icon = AntIcons.Message;
}
}
else if (type == AntBuildMessageView.MessageType.ERROR) {
@@ -15,7 +15,6 @@
*/
package com.intellij.lang.ant.config.explorer;
import com.intellij.icons.AllIcons;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.lang.ant.config.AntBuildFile;
import com.intellij.lang.ant.config.AntBuildFileBase;
@@ -26,6 +25,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.ui.HtmlListCellRenderer;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
import icons.AntIcons;
import org.jetbrains.annotations.NotNull;
final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {
@@ -54,7 +54,7 @@ final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {
if (buildModel != null) {
AntTargetNodeDescriptor.addShortcutText(buildModel.getDefaultTargetActionId(), myAppearance);
}
setIcon(AllIcons.Ant.Build);
myAppearance.setIcon(AntIcons.Build);
myName = myBuildFile.getPresentableName();
return !Comparing.equal(myAppearance, oldAppearance);
}
@@ -16,7 +16,6 @@
package com.intellij.lang.ant.config.explorer;
import com.intellij.execution.RunManagerEx;
import com.intellij.icons.AllIcons;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.lang.ant.config.*;
import com.intellij.lang.ant.config.impl.AntBeforeRunTask;
@@ -39,6 +38,7 @@ import com.intellij.ui.JBColor;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ui.UIUtil;
import icons.AntIcons;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
@@ -68,7 +68,7 @@ final class AntTargetNodeDescriptor extends AntNodeDescriptor {
final CompositeAppearance oldText = myHighlightedText;
final boolean isMeta = myTarget instanceof MetaTarget;
setIcon(isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target);
setIcon(isMeta ? AntIcons.MetaTarget : AntIcons.Target);
myHighlightedText = new CompositeAppearance();
@@ -19,7 +19,6 @@ import com.intellij.execution.BeforeRunTaskProvider;
import com.intellij.execution.RunManagerEx;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.AntBuildFile;
import com.intellij.lang.ant.config.AntBuildTarget;
@@ -29,6 +28,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import icons.AntIcons;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -55,13 +55,13 @@ public class AntBeforeRunTaskProvider extends BeforeRunTaskProvider<AntBeforeRun
@Override
public Icon getIcon() {
return AllIcons.Ant.Target;
return AntIcons.Target;
}
@Override
public Icon getTaskIcon(AntBeforeRunTask task) {
AntBuildTarget antTarget = findTargetToExecute(task);
return antTarget instanceof MetaTarget ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target;
return antTarget instanceof MetaTarget ? AntIcons.MetaTarget : AntIcons.Target;
}
@Override
@@ -22,7 +22,6 @@
*/
package com.intellij.lang.ant.config.impl;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.AntBuildFile;
import com.intellij.lang.ant.config.AntBuildTarget;
@@ -34,6 +33,7 @@ import com.intellij.ui.*;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.util.containers.Convertor;
import com.intellij.util.ui.tree.TreeUtil;
import icons.AntIcons;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
@@ -209,7 +209,7 @@ public class TargetChooserDialog extends DialogWrapper {
final String antTargetName = antTarget.getName();
append(antTargetName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
boolean isMeta = antTarget instanceof MetaTarget;
setIcon(isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target);
setIcon(isMeta ? AntIcons.MetaTarget : AntIcons.Target);
}
}
}
@@ -36,6 +36,7 @@ import com.intellij.util.PlatformIcons;
import com.intellij.util.config.AbstractProperty;
import com.intellij.util.ui.AbstractTableCellEditor;
import com.intellij.util.ui.CellEditorComponentWithBrowseButton;
import icons.AntIcons;
import javax.swing.*;
import javax.swing.text.BadLocationException;
@@ -96,7 +97,7 @@ public class AntUIUtil {
}
public static void customizeAnt(AbstractProperty.AbstractPropertyContainer antProperties, SimpleColoredComponent component) {
component.setIcon(AllIcons.Ant.AntInstallation);
component.setIcon(AntIcons.AntInstallation);
String name = AntInstallation.NAME.get(antProperties);
component.append(name, SimpleTextAttributes.REGULAR_ATTRIBUTES);
String versionString = AntInstallation.VERSION.get(antProperties);
@@ -17,13 +17,17 @@ package com.intellij.lang.ant.dom;
import com.intellij.lang.ant.ForcedAntFileAttribute;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import icons.AntIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
/**
* @author Eugene Zhuravlev
* Date: Apr 6, 2010
@@ -39,6 +43,11 @@ public class AntDomFileDescription extends AntFileDescription<AntDomProject> {
return super.isMyFile(file, module) && isAntFile(file);
}
@Nullable
public Icon getFileIcon(@Iconable.IconFlags int flags) {
return AntIcons.AntBuildXml;
}
public static boolean isAntFile(final XmlFile xmlFile) {
final XmlDocument document = xmlFile.getDocument();
if (document != null) {
@@ -1,30 +0,0 @@
/*
* 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.
*/
package com.intellij.lang.ant.misc;
import com.intellij.util.containers.StringInterner;
public class AntStringInterner {
private static final StringInterner ourInterner = new StringInterner();
public static String intern(final String str) {
return ourInterner.intern(str);
}
private AntStringInterner() {
}
}
+26
View File
@@ -0,0 +1,26 @@
package icons;
import com.intellij.openapi.util.IconLoader;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED
* DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
*/
public class AntIcons {
private static Icon load(String path) {
return IconLoader.getIcon(path, AntIcons.class);
}
public static final Icon AntBuildXml = load("/icons/AntBuildXml.png"); // 16x16
public static final Icon AntInstallation = load("/icons/antInstallation.png"); // 16x16
public static final Icon Build = load("/icons/build.png"); // 16x16
public static final Icon ChangeView = load("/icons/changeView.png"); // 16x16
public static final Icon Message = load("/icons/message.png"); // 16x16
public static final Icon MetaTarget = load("/icons/metaTarget.png"); // 16x16
public static final Icon Properties = load("/icons/properties.png"); // 16x16
public static final Icon Target = load("/icons/target.png"); // 16x16
public static final Icon Task = load("/icons/task.png"); // 16x16
public static final Icon Verbose = load("/icons/verbose.png"); // 16x16
}