This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new bff377d [NETBEANS-3072] Use actual ImageIcons as code completion
actually like.
bff377d is described below
commit bff377d2a242c23e5b59bacc0adf4288eaf1f105
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Thu Sep 12 23:46:20 2019 -0700
[NETBEANS-3072] Use actual ImageIcons as code completion actually like.
---
.../editor/api/completion/CompletionItem.java | 2 -
.../src/org/netbeans/modules/java/ui/Icons.java | 44 +++++++++-------------
2 files changed, 18 insertions(+), 28 deletions(-)
diff --git
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
index 3e0da7b..e04b1f3 100644
---
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
+++
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
@@ -1003,7 +1003,6 @@ public abstract class CompletionItem extends
DefaultCompletionProposal {
@Override
public ImageIcon getIcon() {
- // todo: what happens, if i get a CCE here?
return (ImageIcon)
ElementIcons.getElementIcon(javax.lang.model.element.ElementKind.FIELD,
Utilities.gsfModifiersToModel(modifiers, null));
}
@@ -1045,7 +1044,6 @@ public abstract class CompletionItem extends
DefaultCompletionProposal {
@Override
public ImageIcon getIcon() {
- // todo: what happens, if i get a CCE here?
return (ImageIcon)
ElementIcons.getElementIcon(javax.lang.model.element.ElementKind.LOCAL_VARIABLE,
null);
}
diff --git a/java/java.source/src/org/netbeans/modules/java/ui/Icons.java
b/java/java.source/src/org/netbeans/modules/java/ui/Icons.java
index 6dc9b67..28c173a 100644
--- a/java/java.source/src/org/netbeans/modules/java/ui/Icons.java
+++ b/java/java.source/src/org/netbeans/modules/java/ui/Icons.java
@@ -19,15 +19,12 @@
package org.netbeans.modules.java.ui;
-import java.awt.Image;
import java.util.Collection;
import java.util.Collections;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
-import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.openide.util.ImageUtilities;
-import org.openide.util.Utilities;
/**
*
@@ -44,64 +41,59 @@ public final class Icons {
private Icons() {
}
- public static Icon getBusyIcon () {
- Image img = ImageUtilities.loadImage (WAIT);
- if (img == null) {
- return null;
- }
- else {
- return ImageUtilities.image2Icon (img);
- }
+ public static ImageIcon getBusyIcon () {
+ ImageIcon icon = ImageUtilities.loadImageIcon(WAIT, false);
+ return icon;
}
- public static Icon getElementIcon( ElementKind elementKind,
Collection<Modifier> modifiers ) {
+ public static ImageIcon getElementIcon( ElementKind elementKind,
Collection<Modifier> modifiers ) {
if ( modifiers == null ) {
modifiers = Collections.<Modifier>emptyList();
}
- Image img = null;
+ ImageIcon icon = null;
switch( elementKind ) {
case MODULE:
- img = ImageUtilities.loadImage( ICON_BASE + "module" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon(ICON_BASE + "module" +
PNG_EXTENSION, false );
break;
case PACKAGE:
- img = ImageUtilities.loadImage( ICON_BASE + "package" +
GIF_EXTENSION );
+ icon = ImageUtilities.loadImageIcon(ICON_BASE + "package" +
GIF_EXTENSION, false );
break;
case ENUM:
- img = ImageUtilities.loadImage( ICON_BASE + "enum" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon( ICON_BASE + "enum" +
PNG_EXTENSION, false );
break;
case ANNOTATION_TYPE:
- img = ImageUtilities.loadImage( ICON_BASE + "annotation" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon( ICON_BASE + "annotation" +
PNG_EXTENSION, false );
break;
case CLASS:
- img = ImageUtilities.loadImage( ICON_BASE + "class" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon( ICON_BASE + "class" +
PNG_EXTENSION, false );
break;
case INTERFACE:
- img = ImageUtilities.loadImage( ICON_BASE + "interface" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon( ICON_BASE + "interface" +
PNG_EXTENSION, false );
break;
case FIELD:
- img = ImageUtilities.loadImage( getIconName(elementKind,
ICON_BASE + "field", PNG_EXTENSION, modifiers ) );
+ icon = ImageUtilities.loadImageIcon(getIconName(elementKind,
ICON_BASE + "field", PNG_EXTENSION, modifiers ), false );
break;
case ENUM_CONSTANT:
- img = ImageUtilities.loadImage( ICON_BASE + "constant" +
PNG_EXTENSION );
+ icon = ImageUtilities.loadImageIcon(ICON_BASE + "constant" +
PNG_EXTENSION, false );
break;
case CONSTRUCTOR:
- img = ImageUtilities.loadImage( getIconName(elementKind,
ICON_BASE + "constructor", PNG_EXTENSION, modifiers ) );
+ icon = ImageUtilities.loadImageIcon(getIconName(elementKind,
ICON_BASE + "constructor", PNG_EXTENSION, modifiers ), false );
break;
case INSTANCE_INIT:
case STATIC_INIT:
- img = ImageUtilities.loadImage( getIconName(elementKind,
ICON_BASE + "initializer", PNG_EXTENSION, modifiers ) );
+ icon = ImageUtilities.loadImageIcon(getIconName(elementKind,
ICON_BASE + "initializer", PNG_EXTENSION, modifiers ), false );
break;
case METHOD:
- img = ImageUtilities.loadImage( getIconName(elementKind,
ICON_BASE + "method", PNG_EXTENSION, modifiers ) );
+ icon = ImageUtilities.loadImageIcon(getIconName(elementKind,
ICON_BASE + "method", PNG_EXTENSION, modifiers ), false );
break;
default:
- img = null;
+ icon = null;
}
- return img == null ? null : ImageUtilities.image2Icon (img);
+ return icon;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
