Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: icon rendering [IDE-811] #238

Merged
merged 1 commit into from
Dec 5, 2024
Merged

fix: icon rendering [IDE-811] #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BaseTreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@
import java.util.List;
import java.util.stream.Collectors;

import org.eclipse.core.resources.IResource;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.ImageDataProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;

public class BaseTreeNode extends TreeNode {
private ImageDescriptor imageDescriptor;
Expand Down Expand Up @@ -52,6 +58,19 @@ public void removeChildren() {
public void setImageDescriptor(ImageDescriptor imageDescriptor) {
this.imageDescriptor = imageDescriptor;
}

protected ImageDescriptor getImageDescriptor(IResource object) {
ILabelProvider labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
try {
Image image = labelProvider.getImage(object);
if (image == null || image.isDisposed())
return null;

return getImageDescriptorFromImage(image);
} finally {
labelProvider.dispose();
}
}

public ImageDescriptor getImageDescriptor() {
return this.imageDescriptor;
Expand Down Expand Up @@ -85,4 +104,16 @@ public void reset() {
public String getDetails() {
return "";
}

protected ImageDescriptor getImageDescriptorFromImage(Image image) {
final var data = image.getImageData();

ImageDataProvider provider = new ImageDataProvider() {
@Override
public ImageData getImageData(int zoom) {
return data;
}
};
return ImageDescriptor.createFromImageDataProvider(provider);
}
}
15 changes: 4 additions & 11 deletions plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/ContentRootNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import java.nio.file.Path;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.graphics.Image;
Expand All @@ -28,17 +30,8 @@ public ContentRootNode(String name, Path value) {

@Override
public ImageDescriptor getImageDescriptor() {
ILabelProvider labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
try {
var object = ResourceUtils.getProjectByPath(path);
Image image = labelProvider.getImage(object);
if (image == null || image.isDisposed())
return null;

return ImageDescriptor.createFromImage(image);
} finally {
labelProvider.dispose();
}
var iResource = ResourceUtils.getProjectByPath(path);
return getImageDescriptor(iResource);
}

public ProductTreeNode getProductNode(String product) {
Expand Down
23 changes: 10 additions & 13 deletions plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/FileTreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Iterator;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.ImageDataProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;

public class FileTreeNode extends BaseTreeNode {
Expand All @@ -21,21 +25,14 @@ public FileTreeNode(String value) {

@Override
public ImageDescriptor getImageDescriptor() {
ILabelProvider labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
try {
var files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(getPath().toUri());
var object = files[0];
if (object == null) {
return null;
var files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(getPath().toUri());
for (IFile file : files) {
var descriptor = getImageDescriptor(file);
if (descriptor != null) {
return descriptor;
}
Image image = labelProvider.getImage(object);
if (image == null)
return null;

return ImageDescriptor.createFromImage(image);
} finally {
labelProvider.dispose();
}
return null;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/RootNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void reset() {

for (IProject project : openProjects) {
Path path = ResourceUtils.getFullPath(project);
var contentRoot = new ContentRootNode(project.getName(), path);
BaseTreeNode contentRoot = new ContentRootNode(project.getName(), path);
this.addChild(contentRoot);
}
}
Expand Down
9 changes: 6 additions & 3 deletions .../src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/providers/TreeLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ public Image getImage(Object element) {
return null;
}

if (images.get(imageDescriptor) == null) {
images.putIfAbsent(imageDescriptor, imageDescriptor.createImage());
synchronized (images) {
Image image = images.get(imageDescriptor);
if (image == null || image.isDisposed()) {
images.put(imageDescriptor, imageDescriptor.createImage());
}
return images.get(imageDescriptor);
}
return images.get(imageDescriptor);
}

@Override
Expand Down
Loading