Author: scabanovich Date: 2008-04-04 12:18:29 -0400 (Fri, 04 Apr 2008) New Revision: 7338 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java Log: JBIDE-893 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -10,10 +10,11 @@ ******************************************************************************/ package org.jboss.tools.common.meta; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public interface XAdoptManager { public boolean isAdoptable(XModelObject target, XModelObject object); - public void adopt(XModelObject target, XModelObject object, java.util.Properties p); + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -37,8 +37,10 @@ array[length] = m; length++; } - } catch (Exception e) { + } catch (CoreException e) { ModelPlugin.getDefault().getLog().log(new Status(Status.ERROR, ModelPlugin.PLUGIN_ID, Status.OK, "Model warning: Cannot load class " + cls + ".", e)); + } catch (ClassCastException e2) { + ModelPlugin.getDefault().getLog().log(new Status(Status.ERROR, ModelPlugin.PLUGIN_ID, Status.OK, "Model warning: Cannot load class " + cls + ".", e2)); } } if(length < array.length) { @@ -58,7 +60,7 @@ return false; } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { XAdoptManager[] ms = getManagers(); for (int i = 0; i < ms.length; i++) { if(ms[i].isAdoptable(target, object)) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -77,6 +77,7 @@ return p; } + //TODO throw XModelException public static String extractProperty(XAttributeData ad) { XAttribute a = ad.getAttribute(); String pn = a.getName(); @@ -135,7 +136,7 @@ return (object != null && object.isObjectEditable()); } - public static void addCreatedObject(XModelObject parent, XModelObject child, Properties whereSelect) { + public static void addCreatedObject(XModelObject parent, XModelObject child, Properties whereSelect) throws XModelException { addCreatedObject(parent, child, true, whereSelect); } @@ -155,21 +156,21 @@ return null; } - public static void addCreatedObject(XModelObject parent, XModelObject child, boolean registerundo, Properties whereSelect) { + public static void addCreatedObject(XModelObject parent, XModelObject child, boolean registerundo, Properties whereSelect) throws XModelException { addCreatedObject(parent, child, registerundo, extractWhereSelect(whereSelect)); } - public static void addCreatedObject(XModelObject parent, XModelObject child, int whereSelect) { + public static void addCreatedObject(XModelObject parent, XModelObject child, int whereSelect) throws XModelException { addCreatedObject(parent, child, true, whereSelect); } - public static void addCreatedObject(XModelObject parent, final XModelObject child, boolean registerundo, final int whereSelect) { - if(child == null) throw new RuntimeException(getMessageById("OBJECT_CREATION_FAILURE")); + public static void addCreatedObject(XModelObject parent, final XModelObject child, boolean registerundo, final int whereSelect) throws XModelException { + if(child == null) throw new XModelException(getMessageById("OBJECT_CREATION_FAILURE")); String mes = getContainsMessage(parent, child); - if(mes != null) throw new RuntimeException(mes); + if(mes != null) throw new XModelException(mes); String ce = child.getModelEntity().getName(); XChild c = parent.getModelEntity().getChild(ce); - if(c == null) throw new RuntimeException(getMessageById("OBJECT_ADDING_FAILURE")); + if(c == null) throw new XModelException(getMessageById("OBJECT_ADDING_FAILURE")); int max = c.getMaxCount(); int cur = parent.getChildren(ce).length; if(cur >= max) { @@ -194,7 +195,7 @@ b = parent.addChild(child); } if(!b) { - throw new RuntimeException(getMessageById("OBJECT_ADDING_FAILURE")); + throw new XModelException(getMessageById("OBJECT_ADDING_FAILURE")); } XUndoManager undo = getUndoManager(parent); if(registerundo && undo != null) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -56,13 +56,13 @@ if(stamp == object.getTimeStamp()) undo.rollbackTransactionInProgress(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw new XModelException(e); + XModelException.rethrow(e); } finally { u.commit(); } } - public static void edit(XModelObject object, Properties p) { + public static void edit(XModelObject object, Properties p) throws XModelException { XModelEntity e = object.getModelEntity(); Enumeration en = p.keys(); boolean active = object.isActive(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -63,7 +63,7 @@ return es.length > 0; } - static void changeDefaultEditor(XModel model, String ext, String editor) { + static void changeDefaultEditor(XModel model, String ext, String editor) throws XModelException { XModelObject o = model.getByPath(OpenWithHelper.EDITORS); StringBuffer sb = new StringBuffer(); String ov = o.getAttributeValue("extensions"); @@ -81,7 +81,7 @@ applyChange(o, ov, sb.toString()); } - static void removeDefaultEditor(XModel model, String ext) { + static void removeDefaultEditor(XModel model, String ext) throws XModelException { XModelObject o = model.getByPath(OpenWithHelper.EDITORS); StringBuffer sb = new StringBuffer(); String ov = o.getAttributeValue("extensions"); @@ -99,7 +99,7 @@ sb.append(item); } - private static void applyChange(XModelObject editors, String ov, String nv) { + private static void applyChange(XModelObject editors, String ov, String nv) throws XModelException { if(nv.equals(ov)) return; editors.getModel().changeObjectAttribute(editors, "extensions", nv); editors.getModel().saveOptions(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -42,7 +42,7 @@ start(action.getDisplayName(), f, editor); } - static boolean checkSave(String actionname, XModelObject object) { + static boolean checkSave(String actionname, XModelObject object) throws XModelException { if(!object.isModified() || !object.isActive() || !(object.getParent() instanceof FolderImpl)) return true; ServiceDialog d = object.getModel().getService(); String mes = DefaultCreateHandler.title(object, true) + " is modified.\n" + Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -65,7 +65,7 @@ return res; } - static boolean validatePath(String actionname, XModelObject o) { + static boolean validatePath(String actionname, XModelObject o) throws XModelException { String[] paths = getEnvironmentPaths(); XModel model = o.getModel(); String en = o.getModelEntity().getName(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -83,7 +83,7 @@ } } - protected final void paste(XModelObject parent, int sourceIndex, Properties p) { + protected final void paste(XModelObject parent, int sourceIndex, Properties p) throws XModelException { XModelObject source = getBuffer(parent).source(sourceIndex); XModelObject copy = getBuffer(parent).copy(sourceIndex); XModelObject existing = parent.getChildByPath(copy.getPathPart()); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -433,7 +433,7 @@ this.entity = entity; } - public void adopt(XModelObject target, XModelObject object, Properties p) { + public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException { validate(); if(entity.adopt != null) { entity.adopt.adopt(target, object, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -124,7 +124,7 @@ * @param attributeName * @param newValue */ - public void changeObjectAttribute(XModelObject object, String attributeName, String newValue); + public void changeObjectAttribute(XModelObject object, String attributeName, String newValue) throws XModelException; /** * Does the same as method changeObjectAttribute, but also @@ -138,7 +138,7 @@ * @param attributeName * @param newValue */ - public void editObjectAttribute(XModelObject object, String attributeName, String newValue); + public void editObjectAttribute(XModelObject object, String attributeName, String newValue) throws XModelException; /** * Returns undo manager that keeps multi-changes transaction Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -60,7 +60,12 @@ if(!object.getModel().getFileRegistry().isUpdated(f)) return true; XModelObject c = object.copy(0); load(c); - merge(object, c); + try { + merge(object, c); + } catch (XModelException e) { + //TODO this method should throw XModelException + throw new RuntimeException(e); + } return true; } @@ -72,11 +77,11 @@ return object.getModelEntity().getName().toLowerCase() + ".rex"; } - public static void merge(XModelObject object, XModelObject update) { + public static void merge(XModelObject object, XModelObject update) throws XModelException { merge(object, update, object.isActive()); } - public static void merge(XModelObject object, XModelObject update, boolean fire) { + public static void merge(XModelObject object, XModelObject update, boolean fire) throws XModelException { XModelObjectLoaderUtil.mergeAttributes(object, update, fire); Map<String,XModelObject> map = getChildrenForSaveAsMap(object); Set<String> set = null; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -208,7 +208,7 @@ }); } - XModelObject createFile(XModelObject fs, String path, String body, Properties p) { + XModelObject createFile(XModelObject fs, String path, String body, Properties p) throws XModelException { StringTokenizer st = new StringTokenizer(path, "/"); int c = st.countTokens(), i = 0; while(i < c - 1) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -140,7 +140,7 @@ return get("body"); } - public void edit(String body) { + public void edit(String body) throws XModelException { edit(body, false); } @@ -148,7 +148,7 @@ return "true".equals(get("forceLoad")); } - public void edit(String body, boolean update) { + public void edit(String body, boolean update) throws XModelException { if(body == null) return; if(!isForceLoadOn() && body.equals(getAsText())) return; @@ -212,8 +212,8 @@ changeTimeStamp(); if(b) set("actualBodyTimeStamp", "" + getTimeStamp()); } - protected void mergeAll(XModelObject f, boolean update) { - merge(f, !update); + protected void mergeAll(XModelObject f, boolean update) throws XModelException { + merge(f, !update); } protected boolean isMergingChanges() { @@ -255,7 +255,7 @@ return f; } - protected final void merge(XModelObject update, boolean fire) { + protected final void merge(XModelObject update, boolean fire) throws XModelException { if(!"yes".equals(update.get("isIncorrect"))) { super.set("incorrectBody", ""); super.set("isIncorrect","no"); @@ -307,7 +307,7 @@ } static String NO_MERGE_ATTRIBUTES = ".name.extension._lateload.isIncorrect.incorrectBody.expand."; - void mergeAttributes(XModelObject update, boolean fire) { + void mergeAttributes(XModelObject update, boolean fire) throws XModelException { XAttribute[] as = update.getModelEntity().getAttributes(); for (int i = 0; i < as.length; i++) { String n = as[i].getName(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -78,7 +78,7 @@ iln = Integer.parseInt(ln1); ln1 = "" + (iln - 1); } - } catch (Exception e) { + } catch (NumberFormatException e) { ModelPlugin.getPluginLog().logError(e); } String ep = "ERROR: " + FindObjectHelper.makeRef(getPath() + ":" + ln1, ln + ":" + pos) + " " + er; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -18,7 +18,6 @@ import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.handlers.*; -import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; public class CreateFileHandler extends DefaultCreateHandler { @@ -55,11 +54,7 @@ final XModelObject q = c; if(q != null) Display.getDefault().asyncExec(new Runnable() { public void run() { - try { - XActionInvoker.invoke("Open", q, new Properties()); - } catch (Exception e) { - ModelPlugin.getPluginLog().logError("CreateFileHandler:Open:" + e.getMessage()); - } + XActionInvoker.invoke("Open", q, new Properties()); } }); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -62,7 +62,7 @@ XTransactionUndo u = new XTransactionUndo(d, XTransactionUndo.EDIT); undo.addUndoable(u); try { - XModelObject p = (XModelObject)file.getParent(); + XModelObject p = file.getParent(); DefaultRemoveHandler.removeFromParent(file); DefaultCreateHandler.addCreatedObject(p, o, FindObjectHelper.IN_NAVIGATOR_ONLY); } catch (Exception e) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -171,7 +171,7 @@ return getAttributeValue("body"); } - public void edit(String body) { + public void edit(String body) throws XModelException { getModel().changeObjectAttribute(this, "body", body); } @@ -258,7 +258,7 @@ w.execute(); } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if("body".equals(name) && listener != null) { listener.bodyChanged(newValue); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -27,6 +27,7 @@ import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.BodySource; import org.jboss.tools.common.model.filesystems.FileAuxiliary; @@ -350,7 +351,7 @@ return f; } - private void updateAuxiliary(Map<String,XModelObject> mc, Map<String,File> mf) { + private void updateAuxiliary(Map<String,XModelObject> mc, Map<String,File> mf) throws XModelException { Iterator<String> it = mf.keySet().iterator(); while(it.hasNext()) { String nm = (String)it.next(); @@ -445,7 +446,7 @@ f.set("forceLoad", b ? "true" : ""); } - protected void updateLoaded(XModelObject o, File f) { + protected void updateLoaded(XModelObject o, File f) throws XModelException { FileSystemPeer peer = getFileSystem().getPeer(); if(o instanceof FolderImpl) { if(!o.getAttributeValue("name").equals(f.getName())) { @@ -473,7 +474,13 @@ final File f1 = f; Display.getDefault().asyncExec(new Runnable() { public void run() { - if(question(f1) == 0) reload(o1, f1); + if(question(f1) == 0) { + try { + reload(o1, f1); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } + } } }); } @@ -492,7 +499,7 @@ } } - public void updateChildFile(XModelObject o, File f) { + public void updateChildFile(XModelObject o, File f) throws XModelException { FileSystemPeer peer = getFileSystem().getPeer(); if(!registerFileInPeer(peer, f)) return; int i = (!o.isModified()) ? 0 : @@ -507,7 +514,7 @@ return (!o.getModelEntity().getName().equals(p.getProperty("entity"))); } - private void reload(XModelObject o, File f) { + private void reload(XModelObject o, File f) throws XModelException { Properties p = getEntityProperties(f); if(!o.getModelEntity().getName().equals(p.getProperty("entity"))) { o.removeFromParent(); @@ -538,7 +545,7 @@ } } - protected boolean updateNew(String pathpart, File f, Map<String,XModelObject> toRemove) { + protected boolean updateNew(String pathpart, File f, Map<String,XModelObject> toRemove) throws XModelException { FileSystemPeer peer = getFileSystem().getPeer(); if(peer.contains(f) && !peer.isUpdated(f)) return false; XModelObject c = null; @@ -585,7 +592,7 @@ return null; } - protected void updateRemove(XModelObject o) { + protected void updateRemove(XModelObject o) throws XModelException { boolean d = (o instanceof FolderImpl); FileSystemPeer peer = getFileSystem().getPeer(); File rf = getChildIOFile(o); @@ -703,7 +710,12 @@ if(d == null) { d = new File(f, FileAnyImpl.toFileName(cs[i])); } - b &= saveChild(cs[i], peer, d); + try { + b &= saveChild(cs[i], peer, d); + } catch (XModelException ee) { + //TODO maybe it should be rethrown + ModelPlugin.getPluginLog().logError(ee); + } } t.remove(cs[i].getPathPart()); } @@ -731,7 +743,7 @@ return b; } - public boolean saveChild(XModelObject c) { + public boolean saveChild(XModelObject c) throws XModelException { if(c == null || c.getParent() != this) return false; if(!c.isModified()) return true; File folder = getFile(); @@ -753,7 +765,7 @@ return b; } - private boolean saveChild(XModelObject c, FileSystemPeer peer, File cf) { + private boolean saveChild(XModelObject c, FileSystemPeer peer, File cf) throws XModelException { boolean b = true; if(!cf.exists()) c.setModified(true); if(!c.isModified()) return true; @@ -809,7 +821,7 @@ return true; } - public boolean changeChildTimeStamp(XModelObject c) { + public boolean changeChildTimeStamp(XModelObject c) throws XModelException { if(c == null || c.getParent() != this) return false; File cf = new File(getFile(), FileAnyImpl.toFileName(c)); if(!cf.exists()) return saveChild(c); @@ -823,7 +835,7 @@ return true; } - public void discardChildFile(XModelObject c) { + public void discardChildFile(XModelObject c) throws XModelException { if(c == null || !c.isActive() || !c.isModified() || c.getParent() != this) return; c.setModified(false); XModelObjectLoaderUtil.updateModifiedOnSave(c); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -30,7 +30,7 @@ mount(object, p, entity); } - public XModelObject mount(XModelObject fs, Properties p, String entity) { + public XModelObject mount(XModelObject fs, Properties p, String entity) throws XModelException { validateName(fs, p); XModelObject c = XModelObjectLoaderUtil.createValidObject(fs.getModel(), entity, p); addCreatedObject(fs, c, false, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -33,6 +33,7 @@ import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelBuffer; import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelTransferBuffer; import org.jboss.tools.common.model.event.XModelChangeManager; @@ -258,15 +259,15 @@ return null; } - public void editObjectAttribute(XModelObject object, String attributeName, String value) { + public void editObjectAttribute(XModelObject object, String attributeName, String value) throws XModelException { changeObjectAttribute(object, attributeName, value, true); } - public void changeObjectAttribute(XModelObject object, String attributeName, String value) { + public void changeObjectAttribute(XModelObject object, String attributeName, String value) throws XModelException { changeObjectAttribute(object, attributeName, value, false); } - void changeObjectAttribute(XModelObject object, String attributeName, String value, boolean edit) { + void changeObjectAttribute(XModelObject object, String attributeName, String value, boolean edit) throws XModelException { if(object == null || object.getPath() == null) return; XModelEntity ent = object.getModelEntity(); XAttribute a = ent.getAttribute(attributeName); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -166,7 +166,7 @@ return nv; } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { } public boolean isModified() { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -11,6 +11,7 @@ package org.jboss.tools.common.model.loaders.impl; import java.io.*; + import org.w3c.dom.*; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.loaders.*; @@ -47,9 +48,12 @@ XModelObjectLoaderUtil.setTempBody(object, sw.toString()); object.setModified(true); return true; - } catch (Exception exc) { + } catch (IOException exc) { ModelPlugin.getPluginLog().logError("DefaultEntityLoader:save(" + object.getPresentationString() + "):" + exc.getMessage()); return false; + } catch (XModelException e2) { + ModelPlugin.getPluginLog().logError("DefaultEntityLoader:save(" + object.getPresentationString() + "):" + e2.getMessage()); + return false; } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -145,6 +145,10 @@ f.setUpdateLock(); try { f.edit(body); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + //TODO update method should throw XModelException + throw new RuntimeException(e); } finally { f.releaseUpdateLock(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -11,6 +11,7 @@ package org.jboss.tools.common.model.options; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -55,7 +56,7 @@ return attributeName; } - public void setValue(String value) { + public void setValue(String value) throws XModelException { XModelObject obj = PreferenceModelUtilities.getPreferenceModel().getByPath(option); if(obj == null) { if(ModelPlugin.isDebugEnabled()) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -65,7 +65,7 @@ } public static void initPreferenceValue(XModel initialModel, Preference preference) - { + throws XModelException { String value = preference.getValue(); if (value == null || "".equals(value)) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -8,7 +8,9 @@ import java.util.*; +import org.jboss.tools.common.model.XModelException; + /** * @author Eskimo * @@ -44,7 +46,7 @@ return preference.getValue(); } - public void setValue(String value) { + public void setValue(String value) throws XModelException { if(switchPreference==null) throw new NullPointerException("switchPreference cannot be null, call setSwitchPreferenceFirst."); Preference preference = (Preference)preferencesMap.get(switchPreference.getValue()); if(preference==null) throw new IllegalStateException("Preference in't added for switch value '" + switchPreference.getValue() + "'"); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -57,7 +57,7 @@ } } - public void execute(XModel model, String[][] vs, Map objects) { + public void execute(XModel model, String[][] vs, Map objects) throws XModelException { fireTransactionEvent("transaction_begin"); try { XUndoManager undo = model.getUndoManager(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -62,7 +62,7 @@ return sc; } - private XModelObject findOrCreateDefaultSearch(XModelObject object, XModelObject[] objects) { + private XModelObject findOrCreateDefaultSearch(XModelObject object, XModelObject[] objects) throws XModelException { XModel model = object.getModel(); XModelObject sr = model.getByPath("XStudio/Search"); XModelObject ds = sr.getChildByPath("Default"); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -52,7 +52,7 @@ return (f == null) ? "" : f.getAttributeValue(getHeader()[c]); } - public void setValueAt(int r, int c, String value) { + public void setValueAt(int r, int c, String value) throws XModelException { XModelObject f = getModelObject(r); if(f == null) return; f.getModel().changeObjectAttribute(f, getHeader()[c], value); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -48,7 +48,7 @@ String n = activation[i][1]; try { b.loadClass(n); - } catch (Exception e) { + } catch (ClassNotFoundException e) { ModelPlugin.getPluginLog().logError("ClassLoaderUtil:activate: Cannot find class " + n); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2008-04-04 16:16:17 UTC (rev 7337) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2008-04-04 16:18:29 UTC (rev 7338) @@ -912,11 +912,11 @@ return sb.toString(); } - public static void mergeAttributes(XModelObject destination, XModelObject source) { + public static void mergeAttributes(XModelObject destination, XModelObject source) throws XModelException { mergeAttributes(destination, source, destination.isActive()); } - public static void mergeAttributes(XModelObject destination, XModelObject source, boolean fire) { + public static void mergeAttributes(XModelObject destination, XModelObject source, boolean fire) throws XModelException { XAttribute[] as = destination.getModelEntity().getAttributes(); for (int i = 0; i < as.length; i++) { String n = as[i].getName();