9:02 a.m.
Author: snjeza
Date: 2009-01-30 09:02:54 -0500 (Fri, 30 Jan 2009)
New Revision: 13398
Modified:
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/ImageManager.java
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java
Log:
JBIDE-3661 FreeMarker IDE Plugin Hangs Eclipse with "SWTError: No more handles"
Modified:
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/ImageManager.java
===================================================================
---
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/ImageManager.java 2009-01-30
12:23:25 UTC (rev 13397)
+++
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/ImageManager.java 2009-01-30
14:02:54 UTC (rev 13398)
@@ -21,10 +21,6 @@
*/
package org.jboss.ide.eclipse.freemarker;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
/**
@@ -39,24 +35,7 @@
public static Image getImage(String filename) {
- if (null == filename) return null;
- ImageDescriptor temp = getImageDescriptor(filename);
- if(null!=temp) {
- return temp.createImage();
- } else {
- return null;
- }
+ return Plugin.getDefault().getImage(filename);
}
- public static ImageDescriptor getImageDescriptor(String filename) {
- if (null == filename) return null;
- try {
- URL url = new URL(Plugin.getInstance().getDescriptor().getInstallURL(),
- "icons/" + filename);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException mue) {
-
- }
- return null;
- }
}
\ No newline at end of file
Modified:
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java
===================================================================
---
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java 2009-01-30
12:23:25 UTC (rev 13397)
+++
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java 2009-01-30
14:02:54 UTC (rev 13398)
@@ -23,16 +23,27 @@
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.Bundle;
/**
* @author <a href="mailto:joe@binamics.com">Joe Hudson</a>
@@ -114,14 +125,46 @@
}
public static void log (Throwable t) {
- log("Error: " + t.getMessage() + "\n");
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
- log("Trace: " + sw.toString());
-
+ IStatus status = new Status(IStatus.ERROR,ID,t.getMessage(),t);
+ Plugin.getDefault().getLog().log(status);
}
public static void log (String s) {
- // TODO figure out a good place to log messages
+ IStatus status = new Status(IStatus.ERROR,ID,s);
+ Plugin.getDefault().getLog().log(status);
}
+
+ public Image getImage(String key) {
+ ImageRegistry imageRegistry = getImageRegistry();
+ Image image = imageRegistry.get(key);
+ if (image == null || image.isDisposed()) {
+ ImageDescriptor descriptor = getImageDescriptor(key);
+ if (descriptor != null) {
+ image = descriptor.createImage();
+ imageRegistry.put(key, image);
+ }
+ }
+ return image;
+ }
+
+ public ImageDescriptor getImageDescriptor(String key) {
+ ImageDescriptor imageDescriptor = null;
+ URL gifImageURL = getImageURL(key);
+ if (gifImageURL != null)
+ imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
+ return imageDescriptor;
+ }
+
+ private URL getImageURL(String key) {
+ Bundle bundle = getBundle();
+ IPath path = new Path("icons").append(key);
+ if (FileLocator.find(bundle,path,null) == null)
+ return null;
+ try {
+ return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
+ } catch (MalformedURLException exception) {
+ log(exception);
+ }
+ return null;
+ }
}
\ No newline at end of file