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

NPE

Browse Source
This commit is contained in:
Anna.Kozlova
2017-02-06 13:34:48 +01:00
parent 7394b5016c
commit dae23d7fa1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
+4 -1
View File
@@ -268,7 +268,10 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
setFileName(file.getName());
String toolTipText = IfsUtil.getReferencePath(thumbnailView.getProject(), file);
if (!isFileSizeVisible()) {
toolTipText += " [" + getImageComponent().getDescription() + "]";
String description = getImageComponent().getDescription();
if (description != null) {
toolTipText += " [" + description + "]";
}
}
setToolTipText(toolTipText);
setDirectory(file.isDirectory());
images/src/org/intellij/images/ui/ImageComponent.java
+6 -1
View File
@@ -24,6 +24,7 @@ import org.intellij.images.editor.ImageDocument;
import org.intellij.images.options.GridOptions;
import org.intellij.images.options.TransparencyChessboardOptions;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -200,9 +201,13 @@ public class ImageComponent extends JComponent {
return grid.isVisible();
}
@Nullable
public String getDescription() {
BufferedImage image = getDocument().getValue();
return ImagesBundle.message("icon.dimensions", image.getWidth(), image.getHeight(), image.getColorModel().getPixelSize());
if (image != null) {
return ImagesBundle.message("icon.dimensions", image.getWidth(), image.getHeight(), image.getColorModel().getPixelSize());
}
return null;
}
public void setCanvasSize(int width, int height) {