[nobug] remove unused class and handle to JDT UI image registry
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index 5ea913a..a29ba56 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -79,7 +79,6 @@
import org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetMessages;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
import org.eclipse.jdt.ui.ISharedImages;
import org.eclipse.jdt.ui.JavaElementImageDescriptor;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
@@ -120,7 +119,6 @@
static final Point BIG_SIZE= new Point(16, 16);
- private static ImageDescriptorRegistry fgJavaElementImageRegistry;
private static org.eclipse.jdt.internal.debug.ui.ImageDescriptorRegistry fgDebugImageRegistry;
/**
@@ -569,7 +567,7 @@
* @return whether image registry's have been retrieved.
*/
public static boolean isInitialized() {
- return fgJavaElementImageRegistry != null && fgDebugImageRegistry != null;
+ return fgDebugImageRegistry != null;
}
/**
@@ -741,7 +739,7 @@
if (!fInitialized && Thread.currentThread().equals(JDIDebugUIPlugin.getStandardDisplay().getThread())) {
// call get image registry's to force them to be created on the UI thread
getDebugImageRegistry();
- getJavaElementImageRegistry();
+ JavaPlugin.getImageDescriptorRegistry();
JavaUI.getSharedImages();
fInitialized = true;
}
@@ -916,8 +914,7 @@
protected Image getVariableImage(IAdaptable element) {
JavaElementImageDescriptor descriptor= new JavaElementImageDescriptor(
computeBaseImageDescriptor(element), computeAdornmentFlags(element), BIG_SIZE);
-
- return getJavaElementImageRegistry().get(descriptor);
+ return JavaPlugin.getImageDescriptorRegistry().get(descriptor);
}
/**
@@ -1983,13 +1980,6 @@
}
}
- protected static ImageDescriptorRegistry getJavaElementImageRegistry() {
- if (fgJavaElementImageRegistry == null) {
- fgJavaElementImageRegistry = JavaPlugin.getImageDescriptorRegistry();
- }
- return fgJavaElementImageRegistry;
- }
-
protected static org.eclipse.jdt.internal.debug.ui.ImageDescriptorRegistry getDebugImageRegistry() {
if (fgDebugImageRegistry == null) {
fgDebugImageRegistry = JDIDebugUIPlugin.getImageDescriptorRegistry();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MessageLine.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MessageLine.java
deleted file mode 100644
index 103b4bb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MessageLine.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.debug.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A message line displaying a status.
- */
-public class MessageLine extends CLabel {
-
- private Color fNormalMsgAreaBackground;
-
- /**
- * Creates a new message line as a child of the given parent.
- */
- public MessageLine(Composite parent) {
- this(parent, SWT.LEFT);
- }
-
- /**
- * Creates a new message line as a child of the parent and with the given SWT stylebits.
- */
- public MessageLine(Composite parent, int style) {
- super(parent, style);
- fNormalMsgAreaBackground= getBackground();
- }
-
-
- private Image findImage(IStatus status) {
- if (status.isOK()) {
- return null;
- } else if (status.matches(IStatus.ERROR)) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- } else if (status.matches(IStatus.WARNING)) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
- } else if (status.matches(IStatus.INFO)) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
- }
- return null;
- }
-
- /**
- * Sets the message and image to the given status.
- * <code>null</code> is a valid argument and will set the empty text and no image
- */
- public void setErrorStatus(IStatus status) {
- if (status != null && !status.isOK()) {
- String message= status.getMessage();
- if (message != null && message.length() > 0) {
- setText(message);
- setImage(findImage(status));
- setBackground(JFaceColors.getErrorBackground(getDisplay()));
- return;
- }
- }
- setText(""); //$NON-NLS-1$
- setImage(null);
- setBackground(fNormalMsgAreaBackground);
- }
-}
-
