From 9582745d41e8dc0ce7b05748e350705ff3a2644f Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 7 Sep 2012 19:16:40 +0400 Subject: [PATCH] Support for arbitrary classname for generated icons. Convert to better classname for struts[2], tasks, tapestry, svn --- .../{Svn4ideaIcons.java => SvnIcons.java} | 4 ++-- plugins/svn4idea/src/META-INF/plugin.xml | 6 +++--- .../org/jetbrains/idea/svn/ConflictState.java | 16 +++++++-------- .../svn/actions/ConfigureBranchesAction.java | 4 ++-- .../actions/ShowAllSubmittedFilesAction.java | 4 ++-- .../ShowPropertiesDiffWithLocalAction.java | 4 ++-- .../idea/svn/actions/ShowSvnMapAction.java | 4 ++-- .../svn/history/MergeSourceDetailsAction.java | 4 ++-- .../idea/svn/history/RootsAndBranches.java | 20 +++++++++---------- .../history/SvnCommittedChangesProvider.java | 4 ++-- .../idea/svn/mergeinfo/MergeInfoHolder.java | 10 +++++----- .../tasks/actions/TaskCellRenderer.java | 4 ++-- .../actions/context/LoadContextAction.java | 4 ++-- .../tasks/fogbugz/FogBugzRepositoryType.java | 4 ++-- .../tasks/github/GitHubRepository.java | 4 ++-- .../tasks/github/GitHubRepositoryType.java | 4 ++-- .../intellij/tasks/impl/LocalTaskImpl.java | 10 +++++----- .../lighthouse/LighthouseRepository.java | 4 ++-- .../lighthouse/LighthouseRepositoryType.java | 4 ++-- .../tasks/mantis/MantisRepositoryType.java | 4 ++-- .../pivotal/PivotalTrackerRepositoryType.java | 4 ++-- .../tasks/redmine/RedmineRepository.java | 4 ++-- .../tasks/redmine/RedmineRepositoryType.java | 4 ++-- .../tasks/trac/TracRepositoryType.java | 4 ++-- .../youtrack/YouTrackRepositoryType.java | 4 ++-- .../{TasksCoreIcons.java => TasksIcons.java} | 4 ++-- 26 files changed, 73 insertions(+), 73 deletions(-) rename plugins/svn4idea/resources/icons/{Svn4ideaIcons.java => SvnIcons.java} (96%) rename plugins/tasks/tasks-core/src/icons/{TasksCoreIcons.java => TasksIcons.java} (94%) diff --git a/plugins/svn4idea/resources/icons/Svn4ideaIcons.java b/plugins/svn4idea/resources/icons/SvnIcons.java similarity index 96% rename from plugins/svn4idea/resources/icons/Svn4ideaIcons.java rename to plugins/svn4idea/resources/icons/SvnIcons.java index 599c7dbf678a..685e9e855108 100644 --- a/plugins/svn4idea/resources/icons/Svn4ideaIcons.java +++ b/plugins/svn4idea/resources/icons/SvnIcons.java @@ -8,9 +8,9 @@ import javax.swing.*; * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant * Don't repeat mistakes of others ;-) */ -public class Svn4ideaIcons { +public class SvnIcons { private static Icon load(String path) { - return IconLoader.getIcon(path, Svn4ideaIcons.class); + return IconLoader.getIcon(path, SvnIcons.class); } public static final Icon AllRevisions = load("/icons/allRevisions.png"); // 16x16 diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml index 83b79bf0caf5..d47722d3c2d1 100644 --- a/plugins/svn4idea/src/META-INF/plugin.xml +++ b/plugins/svn4idea/src/META-INF/plugin.xml @@ -32,11 +32,11 @@ - + - + @@ -56,7 +56,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java index cb5ba00539c2..d79b490d60df 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java @@ -15,20 +15,20 @@ */ package org.jetbrains.idea.svn; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.Nullable; import javax.swing.*; public enum ConflictState { none(false, false, false, null), - tree(true, false, false, Svn4ideaIcons.Conflictc), - text(false, true, false, Svn4ideaIcons.Conflictt), - prop(false, false, true, Svn4ideaIcons.Conflictp), - tree_text(true, true, false, Svn4ideaIcons.Conflictct), // ? - - tree_prop(true, false, true, Svn4ideaIcons.Conflictcp), // now falls but marked - text_prop(false, true, true, Svn4ideaIcons.Conflicttp), - all3(true, true, true, Svn4ideaIcons.Conflictctp); // ? - + tree(true, false, false, SvnIcons.Conflictc), + text(false, true, false, SvnIcons.Conflictt), + prop(false, false, true, SvnIcons.Conflictp), + tree_text(true, true, false, SvnIcons.Conflictct), // ? - + tree_prop(true, false, true, SvnIcons.Conflictcp), // now falls but marked + text_prop(false, true, true, SvnIcons.Conflicttp), + all3(true, true, true, SvnIcons.Conflictctp); // ? - private final boolean myTree; private final boolean myText; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java index 2a4349e5282c..36a5d3cdd27f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.ChangeList; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.dialogs.BranchConfigurationDialog; @@ -43,7 +43,7 @@ public class ConfigureBranchesAction extends AnAction implements DumbAware { presentation.setText(SvnBundle.message("configure.branches.item")); presentation.setDescription(SvnBundle.message("configure.branches.item")); - presentation.setIcon(Svn4ideaIcons.ConfigureBranches); + presentation.setIcon(SvnIcons.ConfigureBranches); presentation.setVisible(true); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java index ac9a0ee00dd0..c1835d501875 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java @@ -30,7 +30,7 @@ import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vfs.VirtualFile; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.*; import org.jetbrains.idea.svn.history.SvnChangeList; @@ -51,7 +51,7 @@ public class ShowAllSubmittedFilesAction extends AnAction implements DumbAware { private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.actions.ShowAllSubmittedFilesAction"); public ShowAllSubmittedFilesAction() { - super(SvnBundle.message("action.name.show.all.paths.affected"), null, Svn4ideaIcons.AllRevisions); + super(SvnBundle.message("action.name.show.all.paths.affected"), null, SvnIcons.AllRevisions); } public void update(AnActionEvent e) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java index 5ef1a5d447be..73522c186138 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java @@ -19,7 +19,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; @@ -33,7 +33,7 @@ public class ShowPropertiesDiffWithLocalAction extends AbstractShowPropertiesDif public ShowPropertiesDiffWithLocalAction() { super(SvnBundle.message("action.Subversion.properties.diff.with.local.name")); - myIcon = Svn4ideaIcons.PropertiesDiffWithLocal; + myIcon = SvnIcons.PropertiesDiffWithLocal; } @Override diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java index cac2b8db1f5a..2d6efc338cba 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java @@ -29,7 +29,7 @@ import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.content.ContentManager; import com.intellij.util.ContentsUtil; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.dialogs.CopiesPanel; @@ -47,7 +47,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware { presentation.setEnabled(project != null); presentation.setDescription(SvnBundle.message("action.show.svn.map.description")); - presentation.setIcon(Svn4ideaIcons.ShowWorkingCopies); + presentation.setIcon(SvnIcons.ShowWorkingCopies); } public void actionPerformed(final AnActionEvent e) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java index 3f77a35398a1..4c8766cc5135 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vfs.VirtualFile; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import javax.swing.*; import java.awt.event.KeyEvent; @@ -33,7 +33,7 @@ public class MergeSourceDetailsAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent e) { - e.getPresentation().setIcon(Svn4ideaIcons.MergeSourcesDetails); + e.getPresentation().setIcon(SvnIcons.MergeSourcesDetails); e.getPresentation().setText("Show merge sources details"); e.getPresentation().setEnabled(enabled(e)); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index e88dec62c29b..5aa17e101b8f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -33,7 +33,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.Consumer; import com.intellij.util.NullableFunction; import com.intellij.util.messages.Topic; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; @@ -468,7 +468,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { public void update(final AnActionEvent e) { super.update(e); final Presentation presentation = e.getPresentation(); - presentation.setIcon(Svn4ideaIcons.ShowIntegratedTo); + presentation.setIcon(SvnIcons.ShowIntegratedTo); } public boolean isSelected(final AnActionEvent e) { @@ -489,7 +489,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { public void update(final AnActionEvent e) { super.update(e); final Presentation presentation = e.getPresentation(); - presentation.setIcon(Svn4ideaIcons.ShowIntegratedFrom); + presentation.setIcon(SvnIcons.ShowIntegratedFrom); presentation.setText(SvnBundle.message("committed.changes.action.enable.merge.highlighting")); presentation.setDescription(SvnBundle.message("committed.changes.action.enable.merge.highlighting.description.text")); } @@ -537,19 +537,19 @@ public class RootsAndBranches implements CommittedChangeListDecorator { private class FilterOutMerged extends CommonFilter { private FilterOutMerged() { - super(Svn4ideaIcons.FilterIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.plus")); + super(SvnIcons.FilterIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.plus")); } } private class FilterOutNotMerged extends CommonFilter { private FilterOutNotMerged() { - super(Svn4ideaIcons.FilterNotIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.minus")); + super(SvnIcons.FilterNotIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.minus")); } } private class FilterOutAlien extends CommonFilter { private FilterOutAlien() { - super(Svn4ideaIcons.FilterOthers, SvnBundle.message("tab.repository.merge.panel.filter.others")); + super(SvnIcons.FilterOthers, SvnBundle.message("tab.repository.merge.panel.filter.others")); } } @@ -601,7 +601,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) { final Presentation presentation = e.getPresentation(); - presentation.setIcon(Svn4ideaIcons.MarkAsMerged); + presentation.setIcon(SvnIcons.MarkAsMerged); presentation.setText(myText); presentation.setDescription(myDescription); presentation.setEnabled(presentation.isEnabled() && mergeEnabled(checker.getSelectedLists(), true)); @@ -653,7 +653,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) { final Presentation presentation = e.getPresentation(); - presentation.setIcon(Svn4ideaIcons.MarkAsNotMerged); + presentation.setIcon(SvnIcons.MarkAsNotMerged); presentation.setText(myText); presentation.setDescription(myDescription); presentation.setEnabled(presentation.isEnabled() && mergeEnabled(checker.getSelectedLists(), false)); @@ -689,7 +689,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) { - e.getPresentation().setIcon(Svn4ideaIcons.UndoIntegrateToBranch); + e.getPresentation().setIcon(SvnIcons.UndoIntegrateToBranch); e.getPresentation().setText(SvnBundle.message("undo.integrate.to.branch")); e.getPresentation().setDescription(SvnBundle.message("undo.integrate.to.branch.description")); } @@ -742,7 +742,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) { - e.getPresentation().setIcon(Svn4ideaIcons.IntegrateToBranch); + e.getPresentation().setIcon(SvnIcons.IntegrateToBranch); } protected String getSelectedBranchUrl(SelectedCommittedStuffChecker checker) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java index e6499f46b9a0..64d49fd64e14 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java @@ -40,7 +40,7 @@ import com.intellij.util.PairConsumer; import com.intellij.util.ThrowableConsumer; import com.intellij.util.containers.MultiMap; import com.intellij.util.messages.MessageBusConnection; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.*; @@ -445,7 +445,7 @@ public class SvnCommittedChangesProvider implements CachingCommittedChangesProvi public void update(final AnActionEvent e) { super.update(e); final Presentation presentation = e.getPresentation(); - presentation.setIcon(Svn4ideaIcons.ShowIntegratedFrom); + presentation.setIcon(SvnIcons.ShowIntegratedFrom); presentation.setText(SvnBundle.message("committed.changes.action.enable.merge.highlighting")); presentation.setDescription(SvnBundle.message("committed.changes.action.enable.merge.highlighting.description.text")); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java index 22fd4b5b9452..a08bc68ea618 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vcs.changes.committed.DecoratorManager; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.ui.SimpleTextAttributes; import com.intellij.util.Consumer; -import icons.Svn4ideaIcons; +import icons.SvnIcons; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.dialogs.WCInfoWithBranches; @@ -166,12 +166,12 @@ public class MergeInfoHolder { } public static enum ListMergeStatus { - COMMON(Svn4ideaIcons.Common), - MERGED(Svn4ideaIcons.Integrated), - NOT_MERGED(Svn4ideaIcons.Notintegrated), + COMMON(SvnIcons.Common), + MERGED(SvnIcons.Integrated), + NOT_MERGED(SvnIcons.Notintegrated), //ALIEN(IconLoader.getIcon("/icons/OnDefault.png")), ALIEN(null), - REFRESHING(Svn4ideaIcons.IntegrationStatusUnknown); + REFRESHING(SvnIcons.IntegrationStatusUnknown); private final Icon myIcon; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java index 6d21f250f56c..0d54e7c49ac9 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java @@ -16,7 +16,7 @@ import com.intellij.util.text.Matcher; import com.intellij.util.text.MatcherHolder; import com.intellij.util.ui.EmptyIcon; import com.intellij.util.ui.UIUtil; -import icons.TasksCoreIcons; +import icons.TasksIcons; import javax.swing.*; import java.awt.*; @@ -61,7 +61,7 @@ public class TaskCellRenderer extends DefaultListCellRenderer implements Matcher panel.add(c, BorderLayout.CENTER); } else if (GotoTaskAction.CREATE_NEW_TASK_ACTION == value) { final SimpleColoredComponent c = new SimpleColoredComponent(); - c.setIcon(LayeredIcon.create(TasksCoreIcons.Unknown, AllIcons.Actions.New)); + c.setIcon(LayeredIcon.create(TasksIcons.Unknown, AllIcons.Actions.New)); c.append(GotoTaskAction.CREATE_NEW_TASK_ACTION.getActionText()); panel.add(c, BorderLayout.CENTER); } else if (ChooseByNameBase.NON_PREFIX_SEPARATOR == value) { diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java index bc29a270bad2..79b29fc40a2b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java @@ -36,7 +36,7 @@ import com.intellij.util.Function; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.DateFormatUtil; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -84,7 +84,7 @@ public class LoadContextAction extends BaseTaskAction { @Override Icon getIcon() { - return TasksCoreIcons.SavedContext; + return TasksIcons.SavedContext; } }; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepositoryType.java index 7cfddc0d9bb9..90658b302dc3 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepositoryType.java @@ -17,7 +17,7 @@ package com.intellij.tasks.fogbugz; import com.intellij.tasks.TaskRepository; import com.intellij.tasks.impl.BaseRepositoryType; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -35,7 +35,7 @@ public class FogBugzRepositoryType extends BaseRepositoryType @Override public Icon getIcon() { - return TasksCoreIcons.Fogbugz; + return TasksIcons.Fogbugz; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java index 3171f5e0bd2a..76fb983eaeef 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java @@ -15,7 +15,7 @@ import com.intellij.tasks.impl.BaseRepositoryImpl; import com.intellij.tasks.impl.TaskUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.xmlb.annotations.Tag; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -216,7 +216,7 @@ public class GitHubRepository extends BaseRepositoryImpl { @Override public Icon getIcon() { - return TasksCoreIcons.Github; + return TasksIcons.Github; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java index 1a98f9a32b50..8c787896c8e5 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java @@ -6,7 +6,7 @@ import com.intellij.tasks.TaskState; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.tasks.impl.BaseRepositoryType; import com.intellij.util.Consumer; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -25,7 +25,7 @@ public class GitHubRepositoryType extends BaseRepositoryType { @Override public Icon getIcon() { - return TasksCoreIcons.Github; + return TasksIcons.Github; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java index cf96f18ef1c7..8954012d2920 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java @@ -23,7 +23,7 @@ import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.Property; import com.intellij.util.xmlb.annotations.Tag; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -221,14 +221,14 @@ public class LocalTaskImpl extends LocalTask { } switch (myType) { case BUG: - return TasksCoreIcons.Bug; + return TasksIcons.Bug; case EXCEPTION: - return TasksCoreIcons.Exception; + return TasksIcons.Exception; case FEATURE: - return TasksCoreIcons.Feature; + return TasksIcons.Feature; default: case OTHER: - return isIssue() ? TasksCoreIcons.Other : TasksCoreIcons.Unknown; + return isIssue() ? TasksIcons.Other : TasksIcons.Unknown; } } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java index ba138c544bd0..aae149c8f141 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java @@ -10,7 +10,7 @@ import com.intellij.tasks.impl.BaseRepositoryImpl; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.annotations.Tag; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; @@ -166,7 +166,7 @@ public class LighthouseRepository extends BaseRepositoryImpl { @Override public Icon getIcon() { - return TasksCoreIcons.Lighthouse; + return TasksIcons.Lighthouse; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepositoryType.java index fbd1d9652344..a663594ce222 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepositoryType.java @@ -6,7 +6,7 @@ import com.intellij.tasks.TaskState; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.tasks.impl.BaseRepositoryType; import com.intellij.util.Consumer; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -24,7 +24,7 @@ public class LighthouseRepositoryType extends BaseRepositoryType { @Override public Icon getIcon() { - return TasksCoreIcons.Mantis; + return TasksIcons.Mantis; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java index 4d39136174cd..41e20f7973aa 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java @@ -6,7 +6,7 @@ import com.intellij.tasks.TaskState; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.tasks.impl.BaseRepositoryType; import com.intellij.util.Consumer; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -25,7 +25,7 @@ public class PivotalTrackerRepositoryType extends BaseRepositoryType @Override public Icon getIcon() { - return TasksCoreIcons.Redmine; + return TasksIcons.Redmine; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java index 9cf40acc17cc..205a30da1548 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java @@ -20,7 +20,7 @@ import com.intellij.tasks.TaskRepository; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.tasks.impl.BaseRepositoryType; import com.intellij.util.Consumer; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -38,7 +38,7 @@ public class TracRepositoryType extends BaseRepositoryType { @Override public Icon getIcon() { - return TasksCoreIcons.Trac; + return TasksIcons.Trac; } @NotNull diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java index 606842c74433..06f8ce8f4407 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java @@ -5,7 +5,7 @@ import com.intellij.tasks.TaskState; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.tasks.impl.BaseRepositoryType; import com.intellij.util.Consumer; -import icons.TasksCoreIcons; +import icons.TasksIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -22,7 +22,7 @@ public class YouTrackRepositoryType extends BaseRepositoryType