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

Jump to bottom

Replace deprecated 'getImageData' with 'getImageData(int)' #613

Merged
merged 2 commits into from
Nov 29, 2021
Merged

Replace deprecated 'getImageData' with 'getImageData(int)' #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0a82e3
Replace deprecated 'getImageData' with 'getImageData(int)'
sschulz92 Nov 18, 2021
519679f
Merge branch 'master' into REPLACE_DEPRECATED_USAGE_OF_getImageData
fgdrf Nov 22, 2021
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
80 changes: 42 additions & 38 deletions ...cationtech.udig.document/src/org/locationtech/udig/document/ui/DocumentImageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* uDig - User Friendly Desktop Internet GIS client
/**
* uDig - User Friendly Desktop Internet GIS client
* http://udig.refractions.net
* (C) 2012, Refractions Research Inc.
*
Expand All @@ -11,10 +12,6 @@

import java.io.File;

import org.locationtech.udig.catalog.document.IDocument;
import org.locationtech.udig.catalog.document.IDocument.ContentType;
import org.locationtech.udig.catalog.document.IDocument.Type;
import org.locationtech.udig.document.DocumentPlugin;
import org.eclipse.jface.resource.CompositeImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
Expand All @@ -23,31 +20,37 @@
import org.eclipse.swt.program.Program;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.locationtech.udig.catalog.document.IDocument;
import org.locationtech.udig.catalog.document.IDocument.ContentType;
import org.locationtech.udig.catalog.document.IDocument.Type;
import org.locationtech.udig.document.DocumentPlugin;

/**
* Image provider for document items. This integrates getting the right image for the document item
* type, document type and/or file type with creating overlay decorators.
*
*
* @author Naz Chan
*/
public class DocumentImageProvider extends CompositeImageDescriptor {

private ImageData activeImgData = null;

private ImageData topOverlayImgData = null;

private ImageData bottomOverlayImgData = null;

private Point size;

/**
* Default width for the icon.
*/
private static final int DEFAULT_WIDTH = 20;

/**
* Default height for the icon.
*/
private static final int DEFAULT_HEIGHT = 16;

public DocumentImageProvider() {
size = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
}
Expand All @@ -64,29 +67,29 @@ protected void drawCompositeImage(int width, int height) {
final int xPos = getSize().x - bottomOverlayImgData.width + 1;
final int yPos = getSize().y - bottomOverlayImgData.height + 1;
drawImage(bottomOverlayImgData, xPos, yPos);
}
}
}

@Override
protected Point getSize() {
return size;
}

private ImageData getFileImageData(File file) {
if (file != null) {
final String extension = DocUtils.getExtension(file);
if (extension != null) {
final Program program = Program.findProgram(extension);
if (program != null) {
return program.getImageData();
}
return program.getImageData();
}
}
}
return null;
}

private ImageData getDefaultImageData(ContentType contentType) {

ImageDescriptor descriptor = null;
switch (contentType) {
case FILE:
Expand All @@ -106,29 +109,29 @@ private ImageData getDefaultImageData(ContentType contentType) {
.getImageDescriptor(ISharedImages.IMG_OBJ_ELEMENT);
break;
}

if (descriptor != null) {
return descriptor.getImageData();
return descriptor.getImageData(100);
}
return null;

}

private ImageData getAttachmentOverlay() {
return DocumentPlugin.getDefault().getImageRegistry()
.getDescriptor(IDocumentImages.IMG_OVR_ATTACHMENT).getImageData();
.getDescriptor(IDocumentImages.IMG_OVR_ATTACHMENT).getImageData(100);
}

private ImageData getHotlinkOverlay() {
return DocumentPlugin.getDefault().getImageRegistry()
.getDescriptor(IDocumentImages.IMG_OVR_HOTLINK).getImageData();
.getDescriptor(IDocumentImages.IMG_OVR_HOTLINK).getImageData(100);
}

private ImageData getTemplateOverlay() {
return DocumentPlugin.getDefault().getImageRegistry()
.getDescriptor(IDocumentImages.IMG_OVR_TEMPLATE).getImageData();
.getDescriptor(IDocumentImages.IMG_OVR_TEMPLATE).getImageData(100);
}

private Image createDocumentImage(Type type, ContentType contentType, File file,
boolean isTemplate) {

Expand All @@ -139,25 +142,26 @@ private Image createDocumentImage(Type type, ContentType contentType, File file,
if (activeImgData == null) {
activeImgData = getDefaultImageData(contentType);
}

topOverlayImgData = null;
if (Type.ATTACHMENT == type) {
topOverlayImgData = getAttachmentOverlay();
} if (Type.HOTLINK == type) {
}
if (Type.HOTLINK == type) {
topOverlayImgData = getHotlinkOverlay();
}

bottomOverlayImgData = null;
if (isTemplate) {
bottomOverlayImgData = getTemplateOverlay();
}

return createImage();
}

/**
* Creates an icon for a document. This method draws needed decorators as per document type.
*
*
* @param doc
* @return icon
*/
Expand All @@ -173,28 +177,28 @@ public Image createDocumentImage(IDocument doc) {

/**
* Creates an icon for a folder.
*
*
* @return icon
*/
public Image createFolderImage() {
activeImgData = PlatformUI.getWorkbench().getSharedImages()
.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER).getImageData();
.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER).getImageData(100);
topOverlayImgData = null;
bottomOverlayImgData = null;
return createImage();
}

/**
* Creates the default icon for document items.
*
*
* @return icon
*/
public Image createDefaultImage() {
activeImgData = PlatformUI.getWorkbench().getSharedImages()
.getImageDescriptor(ISharedImages.IMG_OBJ_ELEMENT).getImageData();
.getImageDescriptor(ISharedImages.IMG_OBJ_ELEMENT).getImageData(100);
topOverlayImgData = null;
bottomOverlayImgData = null;
return createImage();
}

}
Loading