Skip to content

Commit 28f6b01

Browse files
eirikbakkeeirikbakke
committed
Simplify a few cases where the new ImageUtilities.mergeIcons method can be used instead of mergeImages.
1 parent 77bd885 commit 28f6b01

7 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/StatisticsPanel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ public final class StatisticsPanel extends JPanel {
8585
private static final Icon alwaysOpenNewTabIcon = ImageUtilities.loadImageIcon("org/netbeans/modules/gsf/testrunner/resources/newTab.png", true);
8686

8787
private static final Icon rerunIcon = ImageUtilities.loadImageIcon("org/netbeans/modules/gsf/testrunner/resources/rerun.png", true);
88-
private static final Icon rerunFailedIcon = ImageUtilities.image2Icon(ImageUtilities.mergeImages(
89-
ImageUtilities.loadImage("org/netbeans/modules/gsf/testrunner/resources/rerun.png"), //NOI18N
90-
ImageUtilities.loadImage("org/netbeans/modules/gsf/testrunner/resources/error-badge.gif"), //NOI18N
91-
8, 8));
88+
private static final Icon rerunFailedIcon = ImageUtilities.mergeIcons(
89+
ImageUtilities.loadIcon("org/netbeans/modules/gsf/testrunner/resources/rerun.png"), //NOI18N
90+
ImageUtilities.loadIcon("org/netbeans/modules/gsf/testrunner/resources/error-badge.gif"), //NOI18N
91+
8, 8);
9292

9393
private static final boolean isMacLaf = "Aqua".equals(UIManager.getLookAndFeel().getID());
9494
private static final Color macBackground = UIManager.getColor("NbExplorerView.background");

‎java/java.editor/src/org/netbeans/modules/java/editor/overridden/ElementDescription.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@ public ElementHandle<Element> getHandle() {
169169
}
170170

171171
public Icon getIcon() {
172-
Image badge;
172+
Icon badge;
173173

174174
if (overriddenFlag) {
175-
badge = ImageUtilities.loadImage("org/netbeans/modules/java/editor/resources/is-overridden-badge.png");
175+
badge = ImageUtilities.loadIcon("org/netbeans/modules/java/editor/resources/is-overridden-badge.png");
176176
} else {
177-
badge = ImageUtilities.loadImage("org/netbeans/modules/java/editor/resources/overrides-badge.png");
177+
badge = ImageUtilities.loadIcon("org/netbeans/modules/java/editor/resources/overrides-badge.png");
178178
}
179179

180-
Image icon = ImageUtilities.icon2Image(ElementIcons.getElementIcon(imageKind, modifiers));
180+
Icon icon = ElementIcons.getElementIcon(imageKind, modifiers);
181181

182-
return ImageUtilities.image2Icon(ImageUtilities.mergeImages(icon, badge, 16, 0));
182+
return ImageUtilities.mergeIcons(icon, badge, 16, 0);
183183
}
184184

185185
public boolean isOverridden() {

‎java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/ui/CreateJREPanel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ private static void setEJDKHome(@NullAllowed final String path) {
604604
}
605605

606606
private static final class EJDKFileView extends FileView {
607-
private static final Image BADGE = ImageUtilities.loadImage("org/netbeans/modules/java/j2seembedded/resources/ejdkBadge.gif", false); // NOI18N
608-
private static final ImageIcon EMPTY = ImageUtilities.loadImageIcon("org/netbeans/modules/java/j2seembedded/resources/empty.gif", false); // NOI18N
607+
private static final Icon BADGE = ImageUtilities.loadIcon("org/netbeans/modules/java/j2seembedded/resources/ejdkBadge.gif"); // NOI18N
608+
private static final Icon EMPTY = ImageUtilities.loadIcon("org/netbeans/modules/java/j2seembedded/resources/empty.gif"); // NOI18N
609609

610610
private final FileSystemView fsv;
611611
private Icon lastOrig;
@@ -628,11 +628,11 @@ public Icon getIcon(@NonNull final File file) {
628628
assert lastMerged != null;
629629
return lastMerged;
630630
}
631-
lastMerged = ImageUtilities.image2Icon(ImageUtilities.mergeImages(
632-
ImageUtilities.icon2Image(original),
631+
lastMerged = ImageUtilities.mergeIcons(
632+
original,
633633
BADGE,
634-
original.getIconWidth() - BADGE.getWidth(null),
635-
original.getIconHeight()- BADGE.getHeight(null)));
634+
original.getIconWidth() - BADGE.getIconWidth(),
635+
original.getIconHeight()- BADGE.getIconHeight());
636636
lastOrig = original;
637637
return lastMerged;
638638
} else {

‎java/maven/src/org/netbeans/modules/maven/problems/BatchProblemNotifier.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ private static class Reactor implements ActionListener {
197197
this.root = root;
198198
n = NotificationDisplayer.getDefault().notify(
199199
build_title(root.getName()),
200-
ImageUtilities.image2Icon(ImageUtilities.mergeImages(
201-
ImageUtilities.loadImage(IconResources.MAVEN_ICON, true),
202-
ImageUtilities.loadImage(IconResources.BROKEN_PROJECT_BADGE_ICON, true), 8, 0)),
200+
ImageUtilities.mergeIcons(
201+
ImageUtilities.loadIcon(IconResources.MAVEN_ICON, true),
202+
ImageUtilities.loadIcon(IconResources.BROKEN_PROJECT_BADGE_ICON, true), 8, 0),
203203
build_details(root), this);
204204
LOG.log(Level.FINE, "created for {0}", root);
205205
}

‎java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/Call.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@ private static Call createReference(CompilationInfo javac, TreePath selection, E
192192

193193
if (isCallerGraph) {
194194
if (parent != null) {
195-
c.icon = ImageUtilities.image2Icon(ImageUtilities.mergeImages(ImageUtilities.icon2Image(i), ImageUtilities.loadImage("org/netbeans/modules/refactoring/java/resources/up.png"), 0, 0));
195+
c.icon = ImageUtilities.mergeIcons(i, ImageUtilities.loadIcon("org/netbeans/modules/refactoring/java/resources/up.png"), 0, 0);
196196
} else {
197197
c.icon = i;
198198
}
199199
} else {
200-
c.icon = ImageUtilities.image2Icon(ImageUtilities.mergeImages(ImageUtilities.icon2Image(i), ImageUtilities.loadImage("org/netbeans/modules/refactoring/java/resources/down.png"), 0, 0));
200+
c.icon = ImageUtilities.mergeIcons(i, ImageUtilities.loadIcon("org/netbeans/modules/refactoring/java/resources/down.png"), 0, 0);
201201
}
202202

203203
c.selection = TreePathHandle.create(selection, javac);

‎java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/scope/CurrentJavaProjectDependenciesScopeProvider.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ public boolean initialize(Lookup context, AtomicBoolean cancel) {
9898
}
9999
scope = Scope.create(Arrays.asList(projectSources), null, null, true);
100100
detail = pi.getDisplayName();
101-
icon = ImageUtilities.image2Icon(ImageUtilities.mergeImages(
102-
ImageUtilities.icon2Image(pi.getIcon()),
103-
ImageUtilities.loadImage("org/netbeans/modules/refactoring/java/resources/binary_badge.gif"),
104-
10, 10));
101+
icon = ImageUtilities.mergeIcons(
102+
pi.getIcon(),
103+
ImageUtilities.loadIcon("org/netbeans/modules/refactoring/java/resources/binary_badge.gif"),
104+
10, 10);
105105
return true;
106106
}
107107

‎webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/browser/ActiveBrowserAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,9 @@ private void updateButton(ProjectBrowserProvider pbp) {
380380
private Icon badgeWithArrowIcon(Image im) {
381381
// #235642
382382
assert im != null : "Image must be provided";
383-
return ImageUtilities.image2Icon(ImageUtilities.mergeImages(im,
384-
ImageUtilities.icon2Image(DropDownButtonFactory.getArrowIcon(false)),
385-
isSmallToolbarIcon() ? 20 : 28, isSmallToolbarIcon() ? 6 : 10)); // NOI18N
383+
return ImageUtilities.mergeIcons(ImageUtilities.image2Icon(im),
384+
DropDownButtonFactory.getArrowIcon(false),
385+
isSmallToolbarIcon() ? 20 : 28, isSmallToolbarIcon() ? 6 : 10); // NOI18N
386386
}
387387

388388
private void showBrowserPickerPopup( JButton invoker ) {

0 commit comments

Comments
 (0)