svn commit: r659688 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java

[hi...@apache.org]

Author: hibou
Date: Fri May 23 15:13:43 2008
New Revision: 659688

URL: http://svn.apache.org/viewvc?rev=659688&view=rev
Log:
IVYDE-10: a try-catch has been added to prevent to break the editor, when the preview will be reintegrated

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=659688&r1=659687&r2=659688&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Fri May 23 15:13:43 2008
@@ -13,6 +13,7 @@
 - IMPROVE: Simplify the resolve process (IVYDE-64) (thanks to Nicolas Lalevée) 
 - IMPROVE: Add new target to build.xml to build the plugin with Ant (IVYDE-88)
 
+- FIX: IvyDE is dependant on environment variable MOZILLA_FIVE_HOME (IVYDE-10)
 - FIX: no support of organization spelling (IVYDE-19)
 - FIX: NPE when setting a bad file for the ivy setting path in the global configuration panel (IVYDE-91)
 - FIX: IvyDE 1.0.3 "Run configuration" problem with Eclipse 3.x (IVYDE-32)

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java?rev=659688&r1=659687&r2=659688&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyEditor.java Fri May 23 15:13:43 2008
@@ -34,7 +34,9 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorInput;
@@ -105,10 +107,19 @@
     }
 
     void createPagePreview() {
-        _browser = new Browser(getContainer(), SWT.NONE);
-        _browser.setUrl(((IvyFileEditorInput) getEditorInput()).getPath().toOSString());
-        int index = addPage(_browser);
-        setPageText(index, "Preview");
+        try {
+            _browser = new Browser(getContainer(), SWT.NONE);
+            _browser.setUrl(((IvyFileEditorInput) getEditorInput()).getPath().toOSString());
+            int index = addPage(_browser);
+            setPageText(index, "Preview");
+        } catch (SWTError e) {
+            // IVYDE-10: under Linux if MOZILLA_FIVE_HOME is not set, it fails badly
+            MessageDialog.openError(IvyPlugin.getActiveWorkbenchShell(),
+                "Fail to create the preview", "The page preview could not be created :"
+                        + e.getMessage());
+            IvyPlugin.log(IStatus.ERROR,
+                "The preview page in the ivy.xml editor could not be created", e);
+        }
     }
 
     /**
@@ -137,7 +148,8 @@
         IFile file = ((IvyFileEditorInput) getEditorInput()).getFile();
         IJavaProject project = JavaCore.create(file.getProject());
         IvyClasspathContainer cp = IvyClasspathUtil.getIvyClasspathContainer(project);
-        if (cp != null && cp.getConf().getIvyXmlPath().equals(file.getProjectRelativePath().toString())) {
+        if (cp != null
+                && cp.getConf().getIvyXmlPath().equals(file.getProjectRelativePath().toString())) {
             cp.scheduleResolve();
         }
     }