Author: scabanovich Date: 2008-04-04 12:21:15 -0400 (Fri, 04 Apr 2008) New Revision: 7343 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java Log: JBIDE-893 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 16:20:47 UTC (rev 7342) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 16:21:15 UTC (rev 7343) @@ -15,6 +15,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.source.SourceViewer; import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.jsf.project.JSFNature; @@ -43,7 +44,7 @@ return "FilePROPERTIES".equals(object.getModelEntity().getName()); } - public void adopt(XModelObject target, XModelObject object, Properties p) { + public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException { if(isAdoptableProperty(object)) adoptProperty(target, object, p); if(isAdoptableBundle(object)) adoptBundle(target, object, p); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java 2008-04-04 16:20:47 UTC (rev 7342) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java 2008-04-04 16:21:15 UTC (rev 7343) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.preferences; +import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.ui.objecteditor.XChildrenEditor; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.*; @@ -17,6 +18,7 @@ import org.eclipse.swt.layout.*; import org.eclipse.swt.widgets.*; import org.eclipse.ui.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.engines.impl.EnginesLoader; import org.jboss.tools.common.model.util.AbstractTableHelper; @@ -182,7 +184,11 @@ public boolean performOk() { long ts = capabilities.getTimeStamp(); - EnginesLoader.merge(capabilities, copy); + try { + EnginesLoader.merge(capabilities, copy); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } if(ts != capabilities.getTimeStamp()) { capabilities.setModified(ts != capabilities.getTimeStamp()); capabilities.save();