Author: scabanovich Date: 2008-03-24 11:18:33 -0400 (Mon, 24 Mar 2008) New Revision: 7078 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaBeanGenerator.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaPropertyGenerator.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/CreateJavaFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/XActionHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/AbstractHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/MultistepWizardSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenCopyHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenDeleteHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CreateIconHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CutHandler.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/DefaultCreateSupport.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/DefaultRedirectHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRemoveHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRenameSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultSpecialHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/FireChangesHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/MoveHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenObjectEditorHandler.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/OpenWithExternalBrowserHandler.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/PasteEnterNewNameSupport.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/action/impl/handlers/PropertiesHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ReplaceWithNewHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SaveAllHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ShowMenuHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SortByNameHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UpdateHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ViewAgentHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpPaletteHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/documentation/GenerateDocumentationHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.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/files/handlers/CreateFolderSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.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/CreateFolderHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DeleteFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DiscardFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HelpOverlappedFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HiddenSystemsHandler.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/filesystems/impl/MountFolderHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MoveFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SaveFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SelectOverlappedFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/UnmountFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameEclipseFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFolderHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/CloseProjectHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/DeleteProjectHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenEditorHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenJavaEditorHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/ProjectPropertiesHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RefreshProjectHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OpenJavaSourceHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OrganizeImportsHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/SortMembersHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/UseSupertypeHandler.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/impl/HiddenPaletteTabsHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/refactoring/RenameProcessorRunner.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/search/impl/SearchExecuteHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/undo/XProtectedTransaction.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AccessibleClasses.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/BrowserHelper.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseJavaUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.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/java/generation/JavaBeanGenerator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaBeanGenerator.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaBeanGenerator.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IBuffer; import org.eclipse.jdt.core.IClasspathEntry; @@ -65,7 +66,7 @@ return EclipseResourceUtil.getJavaProject(project); } - public void generate() throws Exception { + public void generate() throws CoreException { IJavaProject javaproject = getJavaProject(); if(javaproject == null) return; String srcpath = getSrcLocation(javaproject); @@ -89,7 +90,7 @@ doGenerateJava(javaproject, filepath, p); } - private String getSrcLocation(IJavaProject javaproject) throws Exception { + private String getSrcLocation(IJavaProject javaproject) throws CoreException { IClasspathEntry[] entries = javaproject.getResolvedClasspath(true); for (int i = 0; i < entries.length; i++) { if(entries[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue; @@ -105,7 +106,7 @@ return null; } - private void doGenerateJava(IJavaProject javaproject, String filepath, Properties p) throws Exception { + private void doGenerateJava(IJavaProject javaproject, String filepath, Properties p) throws CoreException { IPackageFragmentRoot root = getJavaProjectSrcRoot(javaproject); String pkgname = p.getProperty(PARAM_PACKAGENAME); IPackageFragment pack = root.getPackageFragment(pkgname); @@ -145,7 +146,7 @@ cu.commitWorkingCopy(false, null); } - private String buildClassContent(ICompilationUnit cls, String shortname, String typeContent, String lineDelimiter) throws Exception { + private String buildClassContent(ICompilationUnit cls, String shortname, String typeContent, String lineDelimiter) throws CoreException { StringBuffer qName = new StringBuffer(); qName.append(shortname); String comments = CodeGeneration.getTypeComment(cls, qName.toString(), lineDelimiter); @@ -185,7 +186,7 @@ } } - public static IPackageFragmentRoot getJavaProjectSrcRoot(IJavaProject javaProject) throws Exception { + public static IPackageFragmentRoot getJavaProjectSrcRoot(IJavaProject javaProject) throws CoreException { IClasspathEntry[] es = javaProject.getResolvedClasspath(true); for (int i = 0; i < es.length; i++) { if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaPropertyGenerator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaPropertyGenerator.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/generation/JavaPropertyGenerator.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.java.generation; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.*; import org.eclipse.jdt.core.formatter.CodeFormatter; import org.eclipse.jdt.ui.*; @@ -23,7 +24,7 @@ this.owner = owner; } - public void generate(String name, String javatype, String access, boolean field, boolean getter, boolean setter) throws Exception { + public void generate(String name, String javatype, String access, boolean field, boolean getter, boolean setter) throws CoreException { if("default".equals(access)) access = ""; else access += " "; String fa = (getter && setter) ? "private " : access; ICompilationUnit parentCU = owner.getCompilationUnit(); @@ -54,7 +55,7 @@ cu.commitWorkingCopy(true, null); } - public static void createGetter(ICompilationUnit cu, IType type, String access, String javatype, String name, String lineDelimiter) throws Exception { + public static void createGetter(ICompilationUnit cu, IType type, String access, String javatype, String name, String lineDelimiter) throws CoreException { String methodName = getAccessorName("get", name); if(findGetter(type, methodName) != null) return; String methodHeader = access + javatype + " " + methodName + "()"; @@ -85,7 +86,7 @@ return null; } - public static void createSetter(ICompilationUnit cu, IType type, String access, String javatype, String name, String lineDelimiter) throws Exception { + public static void createSetter(ICompilationUnit cu, IType type, String access, String javatype, String name, String lineDelimiter) throws CoreException { String methodName = getAccessorName("set", name); String methodHeader = access + "void " + methodName + "(" + javatype + " " + name + ")"; String stub = null; @@ -102,7 +103,7 @@ editMethod(cu, m, methodHeader, methodComment, methodContent, lineDelimiter); } - static void editMethod(ICompilationUnit cu, IMethod m, String methodHeader, String methodComment, String methodContent, String lineDelimiter) throws Exception { + static void editMethod(ICompilationUnit cu, IMethod m, String methodHeader, String methodComment, String methodContent, String lineDelimiter) throws CoreException { synchronized(cu) { cu.reconcile(ICompilationUnit.NO_AST, true, null, null); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/CreateJavaFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/CreateJavaFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/CreateJavaFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,6 +17,7 @@ import org.jboss.tools.common.meta.action.SpecialWizard; import org.jboss.tools.common.meta.action.SpecialWizardFactory; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class CreateJavaFileHandler extends AbstractHandler { @@ -25,7 +26,7 @@ return (object.getAdapter(IJavaElement.class) != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.wizard.newfile.NewClassCreationWizard"); wizard.setObject(object); wizard.execute(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/XActionHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/XActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/XActionHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -10,18 +10,19 @@ ******************************************************************************/ package org.jboss.tools.common.meta.action; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public interface XActionHandler { public XEntityData[] getEntityData(XModelObject object); public void setDefaultData(XModelObject object); - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception; + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException; public boolean getSignificantFlag(XModelObject object); public boolean isEnabled(XModelObject object); public boolean hide(boolean enabled); public boolean isEnabled(XModelObject object, XModelObject[] objects); - public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception; + public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/AbstractHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/AbstractHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/AbstractHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ return data; } - public void executeHandler(XModelObject object, Properties p) throws Exception {} + public void executeHandler(XModelObject object, Properties p) throws XModelException {} public boolean getSignificantFlag(XModelObject object) { return false; @@ -91,7 +91,7 @@ return entity1.equals(entity2); } - public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException { if(!isEnabled(object, objects)) return; if(object == null || objects == null || objects.length < 2) { executeHandler(object, p); @@ -141,14 +141,14 @@ ((XActionImpl)action).setWizardClassName(wizard); } - public final void executeInTransaction(XModelObject object, Properties p, String transactionName, int transactionKind) throws Exception { + public final void executeInTransaction(XModelObject object, Properties p, String transactionName, int transactionKind) throws XModelException { if(!isEnabled(object)) return; XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo(transactionName, transactionKind); undo.addUndoable(u); try { transaction(object, p); - } catch (Exception e) { + } catch (XModelException e) { undo.rollbackTransactionInProgress(); throw e; } finally { @@ -156,7 +156,7 @@ } } - protected void transaction(XModelObject object, Properties p) throws Exception { + protected void transaction(XModelObject object, Properties p) throws XModelException { } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/MultistepWizardSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/MultistepWizardSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/MultistepWizardSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -12,6 +12,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.impl.handlers.PasteHandler; +import org.jboss.tools.common.model.XModelException; public class MultistepWizardSupport extends SpecialWizardSupport { protected MultistepWizardStep[] steps = createSteps(); @@ -28,7 +29,7 @@ protected int[] previousSteps = new int[10]; - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { execute(); setFinished(true); @@ -78,20 +79,20 @@ //override - private int next() throws Exception { + private int next() throws XModelException { int step = getStepId() + 1; while(!isRequired(step)) ++step; prepareStep(step); return step; } - protected void prepareStep(int nextStep) throws Exception { + protected void prepareStep(int nextStep) throws XModelException { } protected boolean isRequired(int nextStep) { return true; } - protected void execute() throws Exception {} + protected void execute() throws XModelException {} } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -73,7 +73,7 @@ reset(); } - public void help() throws Exception { + public void help() throws XModelException { HelpUtil.helpEclipse(getTarget().getModel(), getHelpKey()); } @@ -156,7 +156,7 @@ finished = b; } - public abstract void action(String name) throws Exception; + public abstract void action(String name) throws XModelException; public String[] getActionNames(int stepId) { return new String[]{OK, CANCEL, HELP}; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -61,7 +61,7 @@ if(hasHandler()) handler.setDefaultData(object); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(hasHandler()) handler.executeHandler(object, p); } @@ -77,7 +77,7 @@ return hasHandler() && handler.isEnabled(object, objects); } - public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException { if(hasHandler()) handler.executeHandler(object, objects, p); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -12,6 +12,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.AnyElementObjectImpl; @@ -43,7 +44,7 @@ } } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -54,7 +55,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { Properties p = extractStepData(0); String name = p.getProperty("name"); String value = p.getProperty("value"); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenCopyHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenCopyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenCopyHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class ChildrenCopyHandler extends AbstractHandler { @@ -21,7 +22,7 @@ return (object != null && object.getChildren().length > 0); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; XModelObject[] cs = object.getChildren(); XActionInvoker.invoke("CopyActions.Copy", cs[0], cs, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenDeleteHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenDeleteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ChildrenDeleteHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class ChildrenDeleteHandler extends AbstractHandler { @@ -21,7 +22,7 @@ return (object != null && object.isObjectEditable() && object.getChildren().length > 0); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; XModelObject[] cs = object.getChildren(); XActionInvoker.invoke("DeleteActions.Delete", cs[0], cs, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -34,7 +34,7 @@ public CopyHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { object.getModel().getModelBuffer().clear(); object.getModel().getModelBuffer().addSource(object); if(p == null || !"true".equals(p.getProperty("isDrag"))) { @@ -50,7 +50,7 @@ return (object != null); } - public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException { if(!isEnabled(object, objects)) return; XModelBuffer buffer = object.getModel().getModelBuffer(); buffer.clear(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CreateIconHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CreateIconHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CreateIconHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -19,7 +19,7 @@ public CreateIconHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null) return; XEntityData[] es = (XEntityData[])data; String entity = es[0].getModelEntity().getName(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CutHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CutHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CutHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ if(delete == null) delete = new DefaultRemoveHandler(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { load(object); copy.executeHandler(object, p); delete.executeHandler(object, p); @@ -48,7 +48,7 @@ public void setDefaultData(XModelObject object) {} - public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException { load(object); if(isDefault) return; copy.executeHandler(object, objects, p); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ public DefaultCreateHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null || data.length == 0) return; String entity = getEntityName(); Properties p = extractProperties(data[0]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -39,7 +39,7 @@ } } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -50,7 +50,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { String entity = getEntityName(); Properties p = extractStepData(0); XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -20,7 +20,7 @@ public DefaultEditHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null) return; Properties p = extractProperties(data[0]); setOtherProperties(object, p); @@ -42,7 +42,7 @@ return data; } - public static void edit(XModelObject object, Properties p, boolean openTransaction) throws Exception { + public static void edit(XModelObject object, Properties p, boolean openTransaction) throws XModelException { if(!openTransaction) { edit(object, p); return; @@ -56,7 +56,7 @@ if(stamp == object.getTimeStamp()) undo.rollbackTransactionInProgress(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -11,6 +11,7 @@ package org.jboss.tools.common.meta.action.impl.handlers; import java.util.*; + import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.model.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; @@ -73,7 +74,7 @@ return (a == null) ? null : a.getEntityData(getTrueSource(object)); } - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; XAction a = getTrueAction(object); a.executeHandler(getTrueSource(object), p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRemoveHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRemoveHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRemoveHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -19,7 +19,7 @@ public DefaultRemoveHandler() {} - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { if(!isEnabled(object)) return; if(!isUniqueRequiredChild(object)) { removeFromParent(object); @@ -79,7 +79,7 @@ return false; } - private void cleanUniqueRequiredChild(XModelObject object) throws Exception { + private void cleanUniqueRequiredChild(XModelObject object) throws XModelException { XAttribute[] as = object.getModelEntity().getAttributes(); for (int i = 0; i < as.length; i++) { String xml = as[i].getXMLName(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRenameSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRenameSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRenameSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -71,7 +71,7 @@ return new String[]{FINISH, CANCEL}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(name.equals(FINISH)) { returnCode = 0; setFinished(true); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultSpecialHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultSpecialHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultSpecialHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -53,7 +53,7 @@ return false; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; support.setActionData(action, data, object, p); if(support.isFinished()) return; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/FireChangesHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/FireChangesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/FireChangesHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -22,7 +22,7 @@ return object.getModel().getChangeManager().canFire(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { object.getModel().getChangeManager().fire(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/MoveHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/MoveHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/MoveHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -29,7 +29,7 @@ p.isObjectEditable() && (p instanceof XOrderedObject) && ((XOrderedObject)p).areChildrenOrdered()); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; XModelObject o = object.getModel().getModelBuffer().source(); XModelObject p = object.getParent(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenObjectEditorHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenObjectEditorHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenObjectEditorHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ return (object != null && wizard != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; wizard.setObject(object); wizard.execute(); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -26,7 +26,7 @@ return check(object); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; if(!OpenWithExternalHandler.checkSave(action.getDisplayName(), object)) return; ServiceDialog d = object.getModel().getService(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalBrowserHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalBrowserHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalBrowserHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -26,7 +26,7 @@ return b; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String f = getFileName(object); String ext = OpenWithHelper.getExtension(f); @@ -50,7 +50,7 @@ // return null; // } - public static void start(String actionname, String url, XModelObject editor) throws Exception { + public static void start(String actionname, String url, XModelObject editor) throws XModelException { if(OpenWithHelper.validatePath(actionname, editor)) new OWEProcess(editor, url).start(); } } 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -32,7 +32,7 @@ return b; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; if(!checkSave(action.getDisplayName(), object)) return; String f = getFileName(object); @@ -69,16 +69,16 @@ return null; } - public static void start(String actionname, String filename, XModelObject editor) throws Exception { + public static void start(String actionname, String filename, XModelObject editor) throws XModelException { int i = filename.indexOf('#'); String fn = (i < 0) ? filename : filename.substring(0, i); if(!new File(fn).isFile()) throw new RuntimeException("Cannot find file " + fn + "."); if(OpenWithHelper.validatePath(actionname, editor)) new OWEProcess(editor, filename).start(); } - public static void startExplorer(XModel model, String url) throws Exception { + public static void startExplorer(XModel model, String url) throws XModelException { XModelObject editor = model.getByPath("%Options%/External Programs/Internet Browser"); - if(editor == null) throw new Exception("External Program 'Internet Browser' is not set in Options."); + if(editor == null) throw new XModelException("External Program 'Internet Browser' is not set in Options."); if(OpenWithHelper.validatePath("Open", editor)) new OWEProcess(editor, url, true).start(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteEnterNewNameSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteEnterNewNameSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteEnterNewNameSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -62,7 +62,7 @@ return new String[]{OK, CANCEL/*, HELP*/}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { returnCode = 0; setFinished(true); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -59,7 +59,7 @@ if(hasAttribute(o.getModel(), attr, bi)) list.add(new String[]{attr, mandatory}); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; boolean isDrop = (prop != null) && "true".equals(prop.getProperty("isDrop")); int bs = object.getModel().getModelBuffer().getSize(); @@ -69,7 +69,7 @@ } } - protected void execute(XModelObject parent, int sourceIndex, boolean isDrop, Properties p) throws Exception { + protected void execute(XModelObject parent, int sourceIndex, boolean isDrop, Properties p) throws XModelException { XModelBuffer buffer = getBuffer(parent); boolean isParent = isParent(parent, buffer.copy(sourceIndex)); if(isParent) { @@ -144,11 +144,11 @@ protected void onChildPasted(XModelObject child) {} - protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws Exception { + protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws XModelException { paste(parent, sourceIndex, p); } - protected final void drop(XModelObject parent, XModelObject source, Properties p) throws Exception { + protected final void drop(XModelObject parent, XModelObject source, Properties p) throws XModelException { XAdoptManager am = parent.getModelEntity().getAdoptManager(); if(am != null) am.adopt(parent, source, p); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PropertiesHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PropertiesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PropertiesHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -25,7 +25,7 @@ return (object != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String viewMode = action.getProperty("viewMode"); p = HelpUtil.createKey(object, action, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ReplaceWithNewHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ReplaceWithNewHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ReplaceWithNewHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -12,13 +12,14 @@ import java.util.*; import org.jboss.tools.common.meta.action.XAction; +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.XModelObjectLoaderUtil; public class ReplaceWithNewHandler extends DefaultCreateHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null || data.length == 0) return; String entity = getEntityName(); Properties p = extractProperties(data[0]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SaveAllHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SaveAllHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SaveAllHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -19,7 +19,7 @@ SpecialWizard saveEditors = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.objecteditor.SaveEditorsSpecialWizard"); public SaveAllHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(object == null) return; if(saveEditors != null) saveEditors.execute(); object.getModel().save(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ShowMenuHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ShowMenuHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ShowMenuHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -14,6 +14,7 @@ import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; import org.jboss.tools.common.meta.action.impl.XActionListImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class ShowMenuHandler extends AbstractHandler { @@ -23,7 +24,7 @@ return wizard != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XActionList list = getActionList(object); if(list == null) return; p.put("object", object); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SortByNameHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SortByNameHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/SortByNameHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -21,7 +21,7 @@ return object != null && object.isObjectEditable() && object instanceof OrderedObjectImpl; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; OrderedObjectImpl ordered = (OrderedObjectImpl)object; NameComparator c = new NameComparator(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ return new XEntityData[0]; } - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { if(!isEnabled(object)) return; call(object.getModel()); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UpdateHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UpdateHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UpdateHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,7 +18,7 @@ public UpdateHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { object.getModel().update(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ViewAgentHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ViewAgentHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/ViewAgentHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -33,7 +33,7 @@ return (wizard() != null && object != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; AppendTextEvent ev = createTextEvent(object); wizard.setObject(new Object[]{object, ev}); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -22,12 +22,12 @@ return (object != null); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; help(object.getModel(), object.getModelEntity().getName()); } - protected void help(XModel model, String key) throws Exception { + protected void help(XModel model, String key) throws XModelException { HelpUtil.helpEclipse(model, key); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpPaletteHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpPaletteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpPaletteHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,7 +17,7 @@ public HelpPaletteHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; XModelObject tab = getTabObject(object); String key = (tab == null) ? null : tab.getModelEntity().getName() + "_" + tab.getPathPart().replace(' ', '_'); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpUtil.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/help/HelpUtil.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -37,12 +37,12 @@ return path != null && path.length() > 0; } - public static void callHelp(XModel model, String key) throws Exception { + public static void callHelp(XModel model, String key) throws XModelException { String u = (key == null) ? null : keys.getProperty(key); if(u == null) return; //if(u.endsWith("noHelpYet.html")) ModelPlugin.log("Help for key " + key + " is not available."); XModelObject editor = model.getByPath("%Options%/External Programs/Internet Browser"); - if(editor == null) throw new Exception("External Program 'Internet Browser' is not set in Options."); + if(editor == null) throw new XModelException("External Program 'Internet Browser' is not set in Options."); String f = "" + model.getProperties().getProperty(XModelConstants.HOME) + "/doc/help" + u; OpenWithExternalHandler.start("Help", f, editor); } @@ -58,9 +58,9 @@ return path != null && path.length() > 0; } - public static void callExternalBrowser(XModel model, String url) throws Exception { + public static void callExternalBrowser(XModel model, String url) throws XModelException { XModelObject editor = model.getByPath("%Options%/External Programs/Internet Browser"); - if(editor == null) throw new Exception("External Program 'Internet Browser' is not set in Options."); + if(editor == null) throw new XModelException("External Program 'Internet Browser' is not set in Options."); OpenWithExternalBrowserHandler.start("Help", url, editor); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/documentation/GenerateDocumentationHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/documentation/GenerateDocumentationHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/documentation/GenerateDocumentationHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,7 +18,7 @@ public GenerateDocumentationHandler() {} - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { DocumentGenerator g = new DocumentGenerator(); g.setModel(object.getModel()); //// String filename = MetaRootLoader.storage(object).getRootFolder() + "meta.html"; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -24,7 +24,7 @@ return (object != null && XProcessStorage.getDefaultStorage().getRunningInstances(object.getPath()) != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String path = object.getPath(); XProcessStorage s = XProcessStorage.getDefaultStorage(); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -98,7 +98,7 @@ return findAttribute(0, "template") != null; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { if(!checkResource()) return; execute(); @@ -114,7 +114,7 @@ return new String[]{FINISH, CANCEL, HELP}; } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); path = revalidatePath(path); @@ -175,11 +175,15 @@ return path; } - protected XModelObject createFile(String path) throws Exception { + protected XModelObject createFile(String path) throws XModelException { if(!canCreateFile(path)) return null; - String body = getTemplateBody(); - body = modifyBody(body); - return createFile(targetHolder.target, path, body, extractStepData(0)); + try { + String body = getTemplateBody(); + body = modifyBody(body); + return createFile(targetHolder.target, path, body, extractStepData(0)); + } catch (IOException e) { + throw new XModelException(e); + } } protected String getTemplateBody() throws IOException { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -10,6 +10,7 @@ import org.jboss.tools.common.meta.action.impl.WizardDataValidator; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; 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.impl.CreateFileHandler; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; @@ -33,7 +34,7 @@ } @Override - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { if(!checkResource()) return; execute(); @@ -85,7 +86,7 @@ return path; } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); path = revalidatePath(path); @@ -93,7 +94,7 @@ if(f != null) targetHolder.saveLastPath(); } - protected XModelObject createFolder(String path) throws Exception { + protected XModelObject createFolder(String path) throws XModelException { if(!canCreateResource(path)) return null; XModelObject fs = targetHolder.target; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -6,6 +6,7 @@ import org.jboss.tools.common.meta.action.SpecialWizardFactory; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class InvokingWizardHandler extends AbstractHandler { @@ -17,7 +18,7 @@ return sw != null && object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(sw == null || object == null) return; if(p == null) p = new Properties(); String pluginId = action.getProperty("plugin"); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -23,7 +23,7 @@ public class CreateFileHandler extends DefaultCreateHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null || data.length == 0) return; Properties p = extractProperties(data[0]); String defaultExtention = getDefaultExtension(prop); @@ -93,7 +93,7 @@ if(path != null) p.setProperty("path", path); } - private XModelObject getParentFolder(XModelObject object, Properties p) throws Exception { + private XModelObject getParentFolder(XModelObject object, Properties p) throws XModelException { String path = p.getProperty("path"); if(path == null || path.length() == 0) return object; StringTokenizer st = new StringTokenizer(path, "/"); @@ -107,7 +107,7 @@ p.put("childObject", c); return createFolder(c, st); } else if(!"FileFolder".equals(c.getModelEntity().getName())) { - throw new Exception("Cannot create folder " + pp + " in " + object.getPathPart()); + throw new XModelException("Cannot create folder " + pp + " in " + object.getPathPart()); } else { object = c; } @@ -115,7 +115,7 @@ return object; } - private XModelObject createFolder(XModelObject object, StringTokenizer path) throws Exception { + private XModelObject createFolder(XModelObject object, StringTokenizer path) throws XModelException { while(path.hasMoreTokens()) { String pp = path.nextToken(); XModelObject c = object.getModel().createModelObject("FileFolder", null); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFolderHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFolderHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFolderHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,7 +17,7 @@ public class CreateFolderHandler extends DefaultCreateHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; String entity = data[0].getModelEntity().getName(); Properties p = extractProperties(data[0]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DeleteFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DeleteFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DeleteFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.XFileObject; @@ -24,7 +25,7 @@ && (object.getParent() instanceof FolderImpl); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; object.setModified(false); if(closeEditor != null) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DiscardFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DiscardFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/DiscardFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -23,7 +23,7 @@ && object.isModified(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; XModelObject po = object.getParent(); if(po instanceof FolderImpl) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HelpOverlappedFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HelpOverlappedFileSystemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HelpOverlappedFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -16,7 +16,7 @@ public class HelpOverlappedFileSystemHandler extends HelpHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(object != null) help(object.getModel(), "OverlappedFileSystem"); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HiddenSystemsHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HiddenSystemsHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/HiddenSystemsHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -26,7 +26,7 @@ return (/*wizard != null &&*/ object != null && object.isObjectEditable()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.wizards.query.list.HiddenFileSystemsWizard"); XModelObject[] fs = object.getChildren(); 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -21,7 +21,7 @@ public MountFileSystemHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object) || data == null || data.length == 0) return; String entity = data[0].getModelEntity().getName(); p = extractProperties(data[0]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFolderHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFolderHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFolderHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,7 +31,7 @@ return false; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String entity = data[0].getModelEntity().getName(); p = new Properties(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MoveFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MoveFileSystemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MoveFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,7 +18,7 @@ public class MoveFileSystemHandler extends MoveHandler { static SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.struts.webprj.model.helpers.sync.SortFileSystems"); - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; super.executeHandler(object, prop); sortFileSystems(object.getModel()); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SaveFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SaveFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SaveFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -24,7 +24,7 @@ (object.getParent() instanceof FolderImpl)); } - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { if(!isEnabled(object)) return; int q = -1; if(wizard != null) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SelectOverlappedFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SelectOverlappedFileSystemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/SelectOverlappedFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -28,7 +28,7 @@ return o != null && ("true".equals(o.get("overlapped"))); } - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { XModelObject fs = getOverlappedFileSystem(object); if(fs == null) { if(object.isActive() && object.getFileType() == XModelObject.FILE Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/UnmountFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/UnmountFileSystemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/UnmountFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -19,7 +19,7 @@ public UnmountFileSystemHandler() {} - public void executeHandler(XModelObject object, java.util.Properties p) throws Exception { + public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException { if(!isEnabled(object)) return; if(!handleModified(object)) return; XModelObject parent = object.getParent(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameEclipseFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameEclipseFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameEclipseFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,6 +18,7 @@ import org.eclipse.ui.IWorkbenchSite; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -28,7 +29,7 @@ return object != null && object.isObjectEditable(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { final IResource file = EclipseResourceUtil.getResource(object); if(file == null) { XActionInvoker.invoke("EditActions.Rename", object, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,7 +18,7 @@ public class RenameFileHandler extends DefaultEditHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { // prompt file object to build body if it has not been done yet. ((FileAnyImpl)object).getAsText(); super.executeHandler(object, prop); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileSystemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFileSystemHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -23,7 +23,7 @@ String nm = object.getAttributeValue("name"); return !"WEB-INF".equals(nm); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object) || data == null) return; Properties p = extractProperties(data[0]); setOtherProperties(object, p); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFolderHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFolderHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/handlers/RenameFolderHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -12,14 +12,16 @@ import java.util.Properties; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; public class RenameFolderHandler extends DefaultEditHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { FolderImpl f = (FolderImpl)object; f.save(); Properties p = extractProperties(data[0]); @@ -28,7 +30,7 @@ f.save(); } - void rename0(FolderImpl f, String name) throws Exception { + void rename0(FolderImpl f, String name) throws XModelException { IFolder folder = (IFolder)f.getResource(); String n1 = f.get("NAME"); f.set("NAME", name); @@ -37,9 +39,9 @@ try { folder.move(new Path(folder.getParent().getFullPath() + "/" + name), true, null); f.setModified(true); - } catch (Exception e) { + } catch (CoreException e) { f.set("NAME", n1); - throw e; + throw new XModelException(e); } } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/CloseProjectHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/CloseProjectHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/CloseProjectHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,6 +18,7 @@ import org.eclipse.ui.actions.CloseResourceAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class CloseProjectHandler extends AbstractHandler @@ -27,7 +28,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception + public void executeHandler(XModelObject object, Properties p) throws XModelException { IProject project = (IProject)object.getModel().getProperties().get("project"); if (project != null) Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/DeleteProjectHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/DeleteProjectHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/DeleteProjectHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.actions.DeleteResourceAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -26,7 +27,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception + public void executeHandler(XModelObject object, Properties p) throws XModelException { IProject project = (IProject)object.getModel().getProperties().get("project"); if (project != null) Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenEditorHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenEditorHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenEditorHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class OpenEditorHandler extends AbstractHandler { @@ -22,13 +23,17 @@ return (object != null && object.isActive()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(wizard == null) return; if(p == null) p = new Properties(); p.put("object", object); wizard.setObject(p); int i = wizard.execute(); - if(i != 0 && p.get("exception") != null) throw (Exception)p.get("exception"); + if(i != 0 && p.get("exception") != null) { + Exception e = (Exception)p.get("exception"); + if(e instanceof XModelException) throw (XModelException)e; + throw new XModelException(e); + } } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenJavaEditorHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenJavaEditorHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/OpenJavaEditorHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.Properties; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; @@ -23,6 +24,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.ide.IDE; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -32,8 +34,9 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { IProject project = (IProject)object.getModel().getProperties().get("project"); + try { IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID); String className = @@ -47,6 +50,9 @@ IFile f = (IFile)EclipseResourceUtil.getResource(object); if(f != null) IDE.openEditor(getWorkbenchPage(), f); } + } catch (CoreException e) { + throw new XModelException(e); + } } private IWorkbenchPage getWorkbenchPage() { ModelPlugin plugin = ModelPlugin.getDefault(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/ProjectPropertiesHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/ProjectPropertiesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/ProjectPropertiesHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchActionConstants; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -30,7 +31,7 @@ return false; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { IMenuManager m = findWorkbenchMenuManager(IWorkbenchActionConstants.M_PROJECT); final IAction action = findAction(m, "org.eclipse.ui.project.properties"); if(action == null) return; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RefreshProjectHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RefreshProjectHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RefreshProjectHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,6 +17,7 @@ import org.eclipse.ui.actions.RefreshAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -28,7 +29,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception + public void executeHandler(XModelObject object, Properties p) throws XModelException { IProject project = (IProject)object.getModel().getProperties().get("project"); if (project != null) Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.io.*; import java.util.*; import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.common.model.markers.ResourceMarkers; import org.eclipse.jdt.core.*; @@ -50,7 +51,7 @@ return n == null ? null : n.getID(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { IProject project = getProject(object); String nature = (p == null) ? null : p.getProperty("nature"); if(nature == null) nature = getNature(object); @@ -69,26 +70,30 @@ Boolean b = (Boolean)pd.get(ServiceDialog.CHECKED); unregisterWTP = b.booleanValue(); - IProjectDescription d = project.getDescription(); - String[] ns = d.getNatureIds(); - String[] ns2 = removeNature(ns, nature); - if(unregisterWTP) ns2 = new String[]{JavaCore.NATURE_ID}; - if(ns.length == ns2.length) return; - if(unregisterWTP) { - unregisterFromServer(object); - clearClassPath(project); + try { + IProjectDescription d = project.getDescription(); + String[] ns = d.getNatureIds(); + String[] ns2 = removeNature(ns, nature); + if(unregisterWTP) ns2 = new String[]{JavaCore.NATURE_ID}; + if(ns.length == ns2.length) return; + if(unregisterWTP) { + unregisterFromServer(object); + clearClassPath(project); + } + d.setNatureIds(ns2); + project.setDescription(d, IResource.FORCE, null); + if(EclipseResourceUtil.getModelNature(project) != null) return; + String projectLocation = project.getLocation().toString(); + removeFiles(projectLocation, XModelConstants.getWorkspace(object.getModel())); + if(unregisterWTP) { + File f = new File(projectLocation + "/.settings"); + if(f.isDirectory()) FileUtil.remove(f); + } + clear(object.getModel().getByPath("FileSystems/WEB-INF")); + project.refreshLocal(IResource.DEPTH_INFINITE, null); + } catch (CoreException e) { + throw new XModelException(e); } - d.setNatureIds(ns2); - project.setDescription(d, IResource.FORCE, null); - if(EclipseResourceUtil.getModelNature(project) != null) return; - String projectLocation = project.getLocation().toString(); - removeFiles(projectLocation, XModelConstants.getWorkspace(object.getModel())); - if(unregisterWTP) { - File f = new File(projectLocation + "/.settings"); - if(f.isDirectory()) FileUtil.remove(f); - } - clear(object.getModel().getByPath("FileSystems/WEB-INF")); - project.refreshLocal(IResource.DEPTH_INFINITE, null); } private void removeFiles(String location, String workspace) { @@ -122,9 +127,9 @@ // Remove Dynamic Web Project Capabilities - void clearClassPath(IProject project) throws Exception { + void clearClassPath(IProject project) throws XModelException { IJavaProject javaProject = JavaCore.create(project); - ArrayList<IClasspathEntry> newClassPath = new ArrayList<IClasspathEntry>(Arrays.asList(javaProject.getRawClasspath())); + ArrayList<IClasspathEntry> newClassPath = new ArrayList<IClasspathEntry>(getRawClassPath(javaProject)); Iterator<IClasspathEntry> iterator = newClassPath.iterator(); while (iterator.hasNext()) { IClasspathEntry entry = iterator.next(); @@ -138,10 +143,22 @@ } IClasspathEntry[] entries = newClassPath.toArray(new IClasspathEntry[newClassPath.size()]); if(entries.length != 0) { - javaProject.setRawClasspath(entries, new NullProgressMonitor()); + try { + javaProject.setRawClasspath(entries, new NullProgressMonitor()); + } catch (JavaModelException e) { + throw new XModelException(e); + } } } + private List<IClasspathEntry> getRawClassPath(IJavaProject javaProject) throws XModelException { + try { + return Arrays.asList(javaProject.getRawClasspath()); + } catch (JavaModelException e) { + throw new XModelException(e); + } + } + void unregisterFromServer(XModelObject object) { XModelObject fs = FileSystemsHelper.getFileSystems(object.getModel()); XAction action = XActionInvoker.getAction("Registration.UnregisterInServerXML", fs); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.*; import org.eclipse.ui.IObjectActionDelegate; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.extension.ExtensionPointUtil; @@ -29,7 +30,7 @@ return (object != null && object.isActive()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { ILaunchShortcut sc = findLaunchShortcut("org.eclipse.ant.ui.antShortcutWithDialog"); IFile file = (IFile)object.getAdapter(IFile.class); sc.launch(new StructuredSelection(file), ILaunchManager.RUN_MODE); @@ -45,15 +46,19 @@ return null; } - static ILaunchShortcut findLaunchShortcut(String shortcutId) throws Exception { + static ILaunchShortcut findLaunchShortcut(String shortcutId) throws XModelException { String pointId = "org.eclipse.debug.ui.launchShortcuts"; IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(pointId); - if(point == null) throw new Exception("Cannot find extension point " + pointId); + if(point == null) throw new XModelException("Cannot find extension point " + pointId); IConfigurationElement[] es = point.getConfigurationElements(); for (int i = 0; i < es.length; i++) { if(!shortcutId.equals(es[i].getAttribute("id"))) continue; - return (ILaunchShortcut)es[i].createExecutableExtension("class"); + try { + return (ILaunchShortcut)es[i].createExecutableExtension("class"); + } catch (CoreException e) { + throw new XModelException(e); + } } - throw new Exception("Cannot find launch shortcut " + shortcutId); + throw new XModelException("Cannot find launch shortcut " + shortcutId); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -26,7 +27,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { SiteWrapper site = new SiteWrapper(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()); SelectionDispatchAction action = createAction(site); run(site, action, object); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OpenJavaSourceHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OpenJavaSourceHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OpenJavaSourceHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -12,6 +12,7 @@ import java.util.*; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.*; import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; @@ -41,14 +42,18 @@ return action.getProperty("attribute"); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String type = getType(object); type = type.replace('.', '/') + ".java"; - open(object.getModel(), type, p); + try { + open(object.getModel(), type, p); + } catch (CoreException e) { + throw new XModelException(e); + } } - public static void open(XModel model, String type, Properties p) throws Exception { + public static void open(XModel model, String type, Properties p) throws XModelException, CoreException { IProject project = (IProject)model.getProperties().get("project"); IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID); IJavaElement javaElement = javaProject.findElement(new Path(type)); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OrganizeImportsHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OrganizeImportsHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/OrganizeImportsHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.Properties; import org.eclipse.jdt.ui.actions.OrganizeImportsAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -24,7 +25,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception + public void executeHandler(XModelObject object, Properties p) throws XModelException { OrganizeImportsAction action = new OrganizeImportsAction(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()); action.run(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/SortMembersHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/SortMembersHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/SortMembersHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.util.Properties; import org.eclipse.jdt.ui.actions.SortMembersAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -24,7 +25,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception + public void executeHandler(XModelObject object, Properties p) throws XModelException { SortMembersAction action = new SortMembersAction(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()); action.run(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/UseSupertypeHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/UseSupertypeHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/UseSupertypeHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -14,6 +14,7 @@ import org.eclipse.jdt.ui.actions.UseSupertypeAction; import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -23,7 +24,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { UseSupertypeAction action = new UseSupertypeAction(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()); action.run(); } 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -21,7 +21,6 @@ import org.jboss.tools.common.model.filesystems.impl.*; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.common.xml.SAXValidator; public class SimpleWebFileLoader implements SerializingLoader { protected XModelObjectLoaderUtil util = createUtil(); @@ -219,7 +218,7 @@ * @return */ - public static String serialize(Element element, XModelObject object) throws Exception { + public static String serialize(Element element, XModelObject object) throws XModelException, IOException { String encoding = object.getAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING); StringWriter sw = new StringWriter(); try { 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -27,7 +27,7 @@ return (wizard != null && object != null && object.isObjectEditable()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.views.palette.editor.HiddenPaletteTabsWizard"); Map<String,XModelObject> objects = new HashMap<String,XModelObject>(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -87,7 +87,7 @@ } } - public void revalidateLibs(XModel model) throws Exception { + public void revalidateLibs(XModel model) throws XModelException, CoreException { setProject(EclipseResourceUtil.getProject(model.getRoot())); setModel(model); javaProject = JavaCore.create(project); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/refactoring/RenameProcessorRunner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/refactoring/RenameProcessorRunner.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/refactoring/RenameProcessorRunner.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -10,23 +10,29 @@ ******************************************************************************/ package org.jboss.tools.common.model.refactoring; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.internal.corext.refactoring.tagging.*; import org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper; import org.eclipse.jdt.internal.ui.refactoring.reorg.*; import org.eclipse.ltk.core.refactoring.participants.*; import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.plugin.ModelPlugin; public class RenameProcessorRunner { - public static void run(RenameProcessor processor, String name) throws Exception { + public static void run(RenameProcessor processor, String name) throws XModelException { RenameRefactoring refactoring = new RenameRefactoring(processor); initialize(refactoring, name, 0); Shell shell = ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); RenameUserInterfaceStarter starter = new RenameUserInterfaceStarter(); RenameRefactoringWizard wizard = new RenameRefactoringWizard(refactoring, "Rename", "", null, ""); starter.initialize(wizard); - starter.activate(refactoring, shell, RefactoringSaveHelper.SAVE_ALL); + try { + starter.activate(refactoring, shell, RefactoringSaveHelper.SAVE_ALL); + } catch (CoreException e) { + throw new XModelException(e); + } } private static void initialize(RenameRefactoring refactoring, String newName, int flags) { 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -31,11 +31,11 @@ return (wizard() != null && object != null || object.getPath() != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { executeHandler(object, new XModelObject[]{object}, p); } - public void executeHandler(XModelObject object, XModelObject[] objects, Properties p) throws Exception { + public void executeHandler(XModelObject object, XModelObject[] objects, Properties p) throws XModelException { if(!isEnabled(object) || objects == null || objects.length == 0) return; XModelObject sc = getModifiedSearch(object, objects); if(sc == null) return; @@ -43,7 +43,7 @@ wizard.execute(); } - private XModelObject getModifiedSearch(XModelObject object, XModelObject[] objects) throws Exception { + private XModelObject getModifiedSearch(XModelObject object, XModelObject[] objects) throws XModelException { XModel model = object.getModel(); XModelObject sc = findOrCreateDefaultSearch(object, objects); ServiceDialog d = model.getService(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchExecuteHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchExecuteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchExecuteHandler.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -22,7 +22,7 @@ return (SearchDefaultHandler.wizard() != null && object instanceof SearchCommand); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { SearchCommand command = (SearchCommand)object; command.validate(); SearchDefaultHandler.wizard().setObject(new Object[]{command}); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/undo/XProtectedTransaction.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/undo/XProtectedTransaction.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/undo/XProtectedTransaction.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -16,12 +16,12 @@ public class XProtectedTransaction { public interface Executor { - public void execute() throws Exception; + public void execute() throws XModelException; } public XProtectedTransaction() {} - public void execute(XTransactionUndo u, Executor exec, XModelObject listener) throws Exception { + public void execute(XTransactionUndo u, Executor exec, XModelObject listener) throws XModelException { XUndoManager undo = listener.getModel().getUndoManager(); undo.addUndoable(u); try { @@ -34,7 +34,7 @@ undo.addUndoable(ue); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AccessibleClasses.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AccessibleClasses.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AccessibleClasses.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -21,6 +21,7 @@ import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.filesystems.XFileObject; +import org.jboss.tools.common.model.plugin.ModelPlugin; public class AccessibleClasses implements ISimpleTree { private static final int JAVA = 1; @@ -89,7 +90,7 @@ try { exists = getChildren(list, packagename); } catch (JavaModelException e) { - e.printStackTrace(); + ModelPlugin.getPluginLog().logError(e); } return exists; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/BrowserHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/BrowserHelper.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/BrowserHelper.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -26,9 +26,9 @@ public BrowserHelper() {} - public static void startExplorer(XModel model, String url) throws Exception { + public static void startExplorer(XModel model, String url) throws XModelException { XModelObject editor = PreferenceModelUtilities.getPreferenceModel().getByPath("%Options%/Struts Studio/Running"); - if(editor == null) throw new Exception("External Program 'Internet Browser' is not set in Options."); + if(editor == null) throw new XModelException("External Program 'Internet Browser' is not set in Options."); if(validatePath(PreferenceModelUtilities.getPreferenceModel().getService(), editor)) new OWEProcess(editor, url).start(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseJavaUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseJavaUtil.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseJavaUtil.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -11,6 +11,7 @@ package org.jboss.tools.common.model.util; import java.util.*; + import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.*; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -51,8 +52,68 @@ } return null; } + + static String NULL = ";;;"; + + static class Resolved { + IType type; + Map<String, String> types = new HashMap<String, String>(); + Resolved(IType type) { + this.type = type; + } + + void setType(IType type) { + this.type = type; + types.clear(); + } + } + static Map<String,Resolved> resolved = new HashMap<String, Resolved>(); + + static String getKey(IType type) { + String n = type.getFullyQualifiedName(); + IJavaProject jp = type.getJavaProject(); + if(jp == null) return n; + IProject p = jp.getProject(); + if(p == null || !p.isAccessible()) return n; + return p.getName() + ":" + n; + } public static String resolveType(IType type, String typeName) { + if(type == null) return null; + if(type.isBinary() || typeName == null) return typeName; + + String n = getKey(type); + Resolved r = resolved.get(n); + if(r == null) { + r = new Resolved(type); + resolved.put(n, r); + if(resolved.size() % 100 == 0) { + System.out.println("-->" + resolved.size() + " " + n); + } + } + if(r.type != type) { + r.setType(type); + } + + String result = r.types.get(typeName); + + if(result != null) { + return (result == NULL) ? null : result; + } + + result = __resolveType(type, typeName); + + String nresult = result == null ? NULL : result; + + r.types.put(typeName, nresult); + +// System.out.println(n + " " + typeName); + + return result; + + } + + private static String __resolveType(IType type, String typeName) { try { String resolvedArray[][] = type.resolveType(typeName); // resolvedArray == null for primitive types Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -667,7 +667,7 @@ public static IResource getJavaSourceRoot(IProject project) { IJavaProject javaProject = getJavaProject(project); - if(javaProject == null) return null; + if(javaProject == null || !javaProject.isOpen()) return null; try { IClasspathEntry[] es = javaProject.getResolvedClasspath(true); for (int i = 0; i < es.length; i++) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java 2008-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -20,9 +20,11 @@ import java.util.Set; import java.util.TreeSet; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; @@ -40,7 +42,52 @@ MemberInfo fMember; List<MethodInfo> fMethods; List<FieldInfo> fFields; + + private static class ProjectCache { + Map<IMember, MemberInfo> memberInfoCacheFalse = new HashMap<IMember, MemberInfo>(); + Map<IMember, MemberInfo> memberInfoCacheTrue = new HashMap<IMember, MemberInfo>(); + Map<IType, SuperTypeInfo> superTypesCache = new HashMap<IType, SuperTypeInfo>(); + } + + private static Caches caches = new Caches(); + private static class Caches { + ProjectCache common = new ProjectCache(); +// Map<IProject, ProjectCache> cache = new HashMap<IProject, ProjectCache>(); + + public boolean contains(IProject p) { +// return p != null && cache.containsKey(p); + return true; + } + + public void clean(IProject p) { +// if(contains(p)) { +// cache.remove(p); +// } + common = new ProjectCache(); + } + + public ProjectCache get(IProject p) { + if(p == null || !p.isAccessible()) return null; + return common; +// ProjectCache c = cache.get(p); +// if(c == null) { +// c = new ProjectCache(); +// cache.put(p, c); +// } +// return c; + } + + public ProjectCache get(IJavaElement element) { + if(element == null) { + return null; + } + IJavaProject jp = element.getJavaProject(); + IProject p = jp == null ? null : jp.getProject(); + return get(p); + } + } + public static class Type { private String fName; private String fQualifiedName; @@ -585,7 +632,10 @@ SuperTypeInfo(IType type) throws JavaModelException { this.type = type; - superTypesCache.put(type, this); + ProjectCache cache = caches.get(type); + if(cache != null) { + cache.superTypesCache.put(type, this); + } ITypeHierarchy typeHierarchy = type.newSupertypeHierarchy(new NullProgressMonitor()); superTypes = typeHierarchy == null ? null : typeHierarchy.getAllSupertypes(type); if(superTypes != null) for (int i = 0; i < superTypes.length; i++) { @@ -603,11 +653,10 @@ } } - static Map<IType, SuperTypeInfo> superTypesCache = new HashMap<IType, SuperTypeInfo>(); - public static SuperTypeInfo getSuperTypes(IType type) throws JavaModelException { if(type == null) return null; - SuperTypeInfo ts = superTypesCache.get(type); + ProjectCache cache = caches.get(type); + SuperTypeInfo ts = (cache != null) ? cache.superTypesCache.get(type) : null; if(ts == null) { ts = new SuperTypeInfo(type); } @@ -867,18 +916,18 @@ return properties; } - static Map<IMember, MemberInfo> memberInfoCacheFalse = new HashMap<IMember, MemberInfo>(); - static Map<IMember, MemberInfo> memberInfoCacheTrue = new HashMap<IMember, MemberInfo>(); - public static void cleanCache() { - memberInfoCacheFalse.clear(); - memberInfoCacheTrue.clear(); - superTypesCache.clear(); + caches = new Caches(); } public static MemberInfo createMemberInfo(IMember member, boolean dataModel) { - Map<IMember, MemberInfo> cache = dataModel ? memberInfoCacheTrue : memberInfoCacheFalse; - MemberInfo result = cache.get(member); + ProjectCache pcache = caches.get(member); + + Map<IMember, MemberInfo> cache = null; + if(pcache != null) { + cache = dataModel ? pcache.memberInfoCacheTrue : pcache.memberInfoCacheFalse; + } + MemberInfo result = cache == null ? null : cache.get(member); if(result != null) return result; try { if (member instanceof IType) @@ -938,4 +987,5 @@ } return Signature.getTypeVariable(typeSignatures); } + } \ No newline at end of file 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-03-24 15:01:06 UTC (rev 7077) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2008-03-24 15:18:33 UTC (rev 7078) @@ -13,6 +13,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; +import java.io.IOException; import java.io.OutputStream; import java.io.Reader; import java.io.StringWriter; @@ -40,6 +41,7 @@ import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModel; 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.engines.impl.EnginesLoader; import org.jboss.tools.common.model.filesystems.XFileObject; @@ -510,7 +512,7 @@ return (b) ? root : null; } - public static final void serialize(Element element, String filename) throws Exception { + public static final void serialize(Element element, String filename) throws IOException { File f = new File(filename); if(f.exists() && !f.canWrite()) return; if(!f.exists()) f.createNewFile(); @@ -530,43 +532,43 @@ return XMLUtilities.createOutputFormat(encoding); } - public static final boolean serialize(Element element, Writer w) throws Exception { + public static final boolean serialize(Element element, Writer w) throws IOException { if(element == null) return false; serialize(element, new XMLSerializer(w, createOutputFormat("UTF-8"))); w.close(); return true; } - public boolean serialize(XModelObject object, Writer w) throws Exception { + public boolean serialize(XModelObject object, Writer w) throws XModelException, IOException { return serialize(asElement(object), w); } - public static final boolean serialize(Element element, OutputStream w) throws Exception { + public static final boolean serialize(Element element, OutputStream w) throws IOException { if(element == null) return false; serialize(element, new XMLSerializer(w, createOutputFormat("UTF-8"))); w.close(); return true; } - public boolean serialize(XModelObject object, OutputStream w) throws Exception { + public boolean serialize(XModelObject object, OutputStream w) throws XModelException, IOException { return serialize(asElement(object), w); } - public static void serialize(Element element, XMLSerializer serial) throws Exception { + public static void serialize(Element element, XMLSerializer serial) throws IOException { serial.asDOMSerializer(); serial.serialize(element); } - public static void serialize(Document document, XMLSerializer serial) throws Exception { + public static void serialize(Document document, XMLSerializer serial) throws IOException { serial.asDOMSerializer(); serial.serialize(document); } - public static final boolean serialize(Document document, Writer w) throws Exception { + public static final boolean serialize(Document document, Writer w) throws IOException { return serialize(document, w, null); } - public static final boolean serialize(Document document, Writer w, String encoding) throws Exception { + public static final boolean serialize(Document document, Writer w, String encoding) throws IOException, IOException { if(document == null) return false; serialize(document, new XMLSerializer(w, createOutputFormat(encoding))); w.close();