diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java')
-rw-r--r-- | java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java index 57918b1843d1..be586661f0d3 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java @@ -17,7 +17,7 @@ package com.intellij.ide.projectWizard; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.ui.popup.ListItemDescriptor; +import com.intellij.openapi.ui.popup.ListItemDescriptorAdapter; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.IconLoader; @@ -57,7 +57,7 @@ public class ProjectTemplateList extends JPanel { super(new BorderLayout()); add(myPanel, BorderLayout.CENTER); - GroupedItemsListRenderer renderer = new GroupedItemsListRenderer(new ListItemDescriptor<ProjectTemplate>() { + GroupedItemsListRenderer renderer = new GroupedItemsListRenderer(new ListItemDescriptorAdapter<ProjectTemplate>() { @Nullable @Override public String getTextFor(ProjectTemplate value) { @@ -66,26 +66,9 @@ public class ProjectTemplateList extends JPanel { @Nullable @Override - public String getTooltipFor(ProjectTemplate value) { - return null; - } - - @Nullable - @Override public Icon getIconFor(ProjectTemplate value) { return value.getIcon(); } - - @Override - public boolean hasSeparatorAboveOf(ProjectTemplate value) { - return false; - } - - @Nullable - @Override - public String getCaptionAboveOf(ProjectTemplate value) { - return null; - } }) { @Override |