# HG changeset patch # User Eugene Ostroukhov # Date 1265138418 28800 # Node ID a11b7e8dc744d086f444544efd57522b2c6fe8ac # Parent 6f45a9788e49d8e182fa2a14047e2cb0029771cd Minor bugfixes diff -r 6f45a9788e49 -r a11b7e8dc744 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java --- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java Tue Feb 02 08:17:07 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java Tue Feb 02 11:20:18 2010 -0800 @@ -92,9 +92,11 @@ try{ nsIServiceManager servMgr = null; try { + Mozilla.getInstance().initialize(null); servMgr = Mozilla.getInstance().getServiceManager(); if (servMgr == null) return; } catch (Exception x) { + PreviewerPlugin.log(x); // known to throw NullPointException on Mac OS when you're not using // Mozilla. We don't want to pollute the error log with this return; diff -r 6f45a9788e49 -r a11b7e8dc744 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java --- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java Tue Feb 02 08:17:07 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java Tue Feb 02 11:20:18 2010 -0800 @@ -61,13 +61,15 @@ private final IResourceChangeListener resourceListener = new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { - ChangedResourcesCollector visitor = new ChangedResourcesCollector(); - try { - event.getDelta().accept(visitor); - } catch (CoreException e) { - PreviewerPlugin.log(e); + if (event.getDelta() != null) { + ChangedResourcesCollector visitor = new ChangedResourcesCollector(); + try { + event.getDelta().accept(visitor); + } catch (CoreException e) { + PreviewerPlugin.log(e); + } + refreshPages(visitor.files); } - refreshPages(visitor.files); } }; @@ -146,7 +148,8 @@ .getPreferenceStore(); String value = preferenceStore .getString(IWrtEditingPreferences.PREF_AUTO_REFRESH); - if (value == null || value.trim().length() == 0 || MessageDialogWithToggle.PROMPT.equals(value)) { + if (value == null || value.trim().length() == 0 + || MessageDialogWithToggle.PROMPT.equals(value)) { return MessageDialogWithToggle .openYesNoQuestion( getSite().getShell(), diff -r 6f45a9788e49 -r a11b7e8dc744 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Linux).launch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Linux).launch Tue Feb 02 11:20:18 2010 -0800 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 6f45a9788e49 -r a11b7e8dc744 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Tue Feb 02 08:17:07 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Tue Feb 02 11:20:18 2010 -0800 @@ -54,6 +54,9 @@ public static final String PREVIEW_MAIN_FILE = "wrt_preview_main.html"; private static boolean isDefaultProjectLocation(URI uri) { + if (uri == null) { + return true; + } File file = new File(uri); IPath project = new Path(file.getAbsolutePath()); IPath workspace = ResourcesPlugin.getWorkspace().getRoot()