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

Support for arbitrary classname for generated icons. Convert to better classname for struts[2], tasks, tapestry, svn

Browse Source
This commit is contained in:
Maxim Shafirov
2012-09-07 19:18:17 +04:00
parent 2159c26234
commit 9582745d41
26 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/resources/icons/Svn4ideaIcons.java → plugins/svn4idea/resources/icons/SvnIcons.java
+2 -2
View File
@@ -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
plugins/svn4idea/src/META-INF/plugin.xml
+3 -3
View File
@@ -32,11 +32,11 @@
</group>
<action id="IntegrateChangeSetAction" class="org.jetbrains.idea.svn.actions.IntegrateChangeSetAction" popup="true" icon="Svn4ideaIcons.IntegrateToBranch">
<action id="IntegrateChangeSetAction" class="org.jetbrains.idea.svn.actions.IntegrateChangeSetAction" popup="true" icon="SvnIcons.IntegrateToBranch">
<add-to-group group-id="RepositoryChangesBrowserToolbar" anchor="last"/>
</action>
<action id="PropertiesDiff" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction" popup="true" icon="Svn4ideaIcons.PropertiesDiff">
<action id="PropertiesDiff" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction" popup="true" icon="SvnIcons.PropertiesDiff">
<add-to-group group-id="RepositoryChangesBrowserToolbar" anchor="last"/>
</action>
@@ -56,7 +56,7 @@
<separator/>
<action id="Subversion.ShowProperties" class="org.jetbrains.idea.svn.actions.ShowPropertiesAction"/>
<action id="Subversion.SetProperty" class="org.jetbrains.idea.svn.actions.SetPropertyAction"/>
<action id="ShowPropertiesDiffVsLocal" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffWithLocalAction" icon="Svn4ideaIcons.PropertiesDiffWithLocal">
<action id="ShowPropertiesDiffVsLocal" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffWithLocalAction" icon="SvnIcons.PropertiesDiffWithLocal">
</action>
<reference id="ChangesView.Revert"/>
<action id="Subversion.Resolve" class="org.jetbrains.idea.svn.actions.ResolveAction"/>
plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java
+8 -8
View File
@@ -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;
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java
+2 -2
View File
@@ -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);
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java
+2 -2
View File
@@ -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) {
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java
+2 -2
View File
@@ -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
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
+2 -2
View File
@@ -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) {
plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java
+2 -2
View File
@@ -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));
}
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+10 -10
View File
@@ -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) {
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
+2 -2
View File
@@ -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"));
}
plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java
+5 -5
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java
+2 -2
View File
@@ -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) {
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java
+2 -2
View File
@@ -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;
}
};
}
plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepositoryType.java
+2 -2
View File
@@ -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<FogBugzRepository>
@Override
public Icon getIcon() {
return TasksCoreIcons.Fogbugz;
return TasksIcons.Fogbugz;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java
+2 -2
View File
@@ -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
plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java
+2 -2
View File
@@ -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<GitHubRepository> {
@Override
public Icon getIcon() {
return TasksCoreIcons.Github;
return TasksIcons.Github;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
+5 -5
View File
@@ -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;
}
}
plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
+2 -2
View File
@@ -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
plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepositoryType.java
+2 -2
View File
@@ -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<LighthouseRepos
@Override
public Icon getIcon() {
return TasksCoreIcons.Lighthouse;
return TasksIcons.Lighthouse;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryType.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.intellij.tasks.mantis;
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.*;
@@ -20,7 +20,7 @@ public class MantisRepositoryType extends BaseRepositoryType<MantisRepository> {
@Override
public Icon getIcon() {
return TasksCoreIcons.Mantis;
return TasksIcons.Mantis;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java
+2 -2
View File
@@ -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<PivotalTrac
@Override
public Icon getIcon() {
return TasksCoreIcons.Pivotal;
return TasksIcons.Pivotal;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java
+2 -2
View File
@@ -12,7 +12,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;
@@ -135,7 +135,7 @@ public class RedmineRepository extends BaseRepositoryImpl {
@Override
public Icon getIcon() {
return TasksCoreIcons.Redmine;
return TasksIcons.Redmine;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryType.java
+2 -2
View File
@@ -5,7 +5,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.*;
@@ -23,7 +23,7 @@ public class RedmineRepositoryType extends BaseRepositoryType<RedmineRepository>
@Override
public Icon getIcon() {
return TasksCoreIcons.Redmine;
return TasksIcons.Redmine;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java
+2 -2
View File
@@ -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<TracRepository> {
@Override
public Icon getIcon() {
return TasksCoreIcons.Trac;
return TasksIcons.Trac;
}
@NotNull
plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java
+2 -2
View File
@@ -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<YouTrackRepositor
}
public Icon getIcon() {
return TasksCoreIcons.Youtrack;
return TasksIcons.Youtrack;
}
@NotNull
plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java → plugins/tasks/tasks-core/src/icons/TasksIcons.java
+2 -2
View File
@@ -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 TasksCoreIcons {
public class TasksIcons {
private static Icon load(String path) {
return IconLoader.getIcon(path, TasksCoreIcons.class);
return IconLoader.getIcon(path, TasksIcons.class);
}
public static final Icon Bug = load("/icons/bug.png"); // 16x16