March 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r7078 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: java/model/handler and 18 other directories.

by jbosstools-commits＠lists.jboss.org

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();

18 years

1
0
0 / 0

JBoss Tools SVN: r7077 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts: model/handlers/page and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 11:01:06 -0400 (Mon, 24 Mar 2008) New Revision: 7077 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java Log: JBIDE-893 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,7 @@ return object.getAttributeValue(getAttr(object)).length() > 0; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; object.getModel().changeObjectAttribute(object, getAttr(object), ""); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -22,7 +22,7 @@ public BuildProcessHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("Build " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); undo.addUndoable(u); @@ -34,7 +34,7 @@ object.setModified(true); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public CleanActionForwardAttrHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String attr = getAttribute(object); if(attr != null) object.getModel().changeObjectAttribute(object, attr, ""); //$NON-NLS-1$ } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ 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 CreateActionHandler extends AbstractHandler { @@ -22,7 +23,7 @@ return (object != null && object.isObjectEditable()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { ///no trial XActionInvoker.invoke("CreateActions.CreateAction", object, p); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -21,7 +21,7 @@ public CreateCommentForItemHandler() {} - 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/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -22,7 +22,7 @@ public CreateCommentHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { pc = p; super.executeHandler(object, p); StrutsProcessStructureHelper.instance.showComments(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,7 @@ public CreateConfigElementHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { createdObject = null; if(!createUnconfirmedAction(object, p)) { executeHandler0(object, p); @@ -34,7 +34,7 @@ Properties runProperties = null; - public void executeHandler0(XModelObject object, Properties p) throws Exception { + public void executeHandler0(XModelObject object, Properties p) throws XModelException { runProperties = p; try { super.executeHandler(object, p); @@ -99,7 +99,7 @@ // create unconfirmed action - private boolean createUnconfirmedAction(XModelObject object, Properties p) throws Exception { + private boolean createUnconfirmedAction(XModelObject object, Properties p) throws XModelException { if(!"CreateAction".equals(action.getName())) return false; Properties p2 = extractProperties(data[0]); setOtherProperties(object, p2); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -38,7 +38,7 @@ return false; } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("create element in " + DefaultCreateHandler.title(object, false), XTransactionUndo.ADD); @@ -47,7 +47,7 @@ transaction(object, prop); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } @@ -87,7 +87,7 @@ p.setProperty(ATT_PATH, path); } - protected void transaction(XModelObject object, Properties prop) throws Exception { + protected void transaction(XModelObject object, Properties prop) throws XModelException { executeHandler0(object, prop); Properties p = extractProperties(data[0]); String path = p.getProperty(ATT_PATH); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -22,7 +22,7 @@ public CreateLinkHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { super.executeHandler(object, prop); StrutsProcessImpl pi = (StrutsProcessImpl)object.getParent(); pi.getHelper().updatePages(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -75,7 +75,7 @@ } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { Properties p = extractProperties(data[0]); checkRegister(object, p); XUndoManager undo = object.getModel().getUndoManager(); @@ -98,16 +98,16 @@ } } - private void checkRegister(XModelObject object, Properties p) throws Exception { + private void checkRegister(XModelObject object, Properties p) throws XModelException { boolean register = "yes".equals(extractProperties(data[0]).getProperty("register in web.xml")); //$NON-NLS-1$ //$NON-NLS-2$ if(!register) return; XModelObject webxml = WebAppHelper.getWebApp(object.getModel()); - if(webxml == null) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_ISNOT_FOUND); - if("yes".equals(webxml.get("isIncorrect"))) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_INCORRECT); //$NON-NLS-1$ //$NON-NLS-2$ - if(!webxml.isObjectEditable()) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_READONLY); + if(webxml == null) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_ISNOT_FOUND); + if("yes".equals(webxml.get("isIncorrect"))) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_INCORRECT); //$NON-NLS-1$ //$NON-NLS-2$ + if(!webxml.isObjectEditable()) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_READONLY); } - private void register(XModelObject object, Properties prop) throws Exception { + private void register(XModelObject object, Properties prop) throws XModelException { String uri = "/WEB-INF/" + FileAnyImpl.toFileName(created); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); if(incompleteModules.contains(module)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.files.handlers.*; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -76,7 +77,7 @@ setAttributeValue(0, "name", namef); //$NON-NLS-1$ } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p0 = extractStepData(0); XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo(StrutsUIMessages.CREATE_STRUTS_CONFIG + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD); //$NON-NLS-2$ //$NON-NLS-3$ @@ -91,7 +92,7 @@ } } - private void doExecute(Properties p0) throws Exception { + private void doExecute(Properties p0) throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); //$NON-NLS-1$ path = revalidatePath(path); @@ -126,7 +127,7 @@ return null; } - private void register(XModelObject object, Properties prop) throws Exception { + private void register(XModelObject object, Properties prop) throws XModelException { String uri = getURI(object); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); //$NON-NLS-1$ if(incompleteModules.contains(module)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public class CreateStrutsConfig_1_0Handler extends CreateFileHandler implements StrutsConstants { private XModelObject created = null; - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { try { super.executeHandler(object, prop); if(created != null) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.Properties; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.files.handlers.*; import org.jboss.tools.struts.*; @@ -20,7 +21,7 @@ public class CreateStrutsConfig_1_0Support extends CreateFileSupport implements StrutsConstants { - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); path = revalidatePath(path); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public class DeleteStrutsConfigHandler extends DeleteFileHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String uri = getURI(object); if(uri == null) return; boolean unregister = false; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.model.handlers; import java.util.*; + +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler; import org.jboss.tools.common.model.loaders.XObjectLoader; @@ -20,7 +22,7 @@ public class DiscardConfigHandler extends DiscardFileHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; XModelObject process = StrutsProcessStructureHelper.instance.getProcess(object); if(process != null && StrutsProcessStructureHelper.instance.isProcessLoaded(process)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public EditGlobalElementPath() {} - public void executeHandler0(XModelObject object, Properties prop) throws Exception { + public void executeHandler0(XModelObject object, Properties prop) throws XModelException { Properties p = extractProperties(data[0]); setOtherProperties(object, p); modifyCreatedObject(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -67,7 +68,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("action class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -129,7 +129,7 @@ target.getModel().getOut().println(msg + FindObjectHelper.makeRef(path, className)); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if (GENERATE.equals(name)) { doStep(target, getStepId()); setStepId(steps.length-2); @@ -260,11 +260,14 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { if (exc != null) { setStepId(getStepId()+1); + if(exc instanceof XModelException) { + throw (XModelException)exc; + } if (exc instanceof Exception) { - throw (Exception)exc; + throw new XModelException(exc); } throw new RuntimeException(exc.getMessage()); } @@ -299,7 +302,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { return 1; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -68,7 +69,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("exception class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -68,7 +69,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("formbean class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -67,7 +68,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_CLASSNAME); String nc = p2.getProperty("forward class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -166,7 +167,7 @@ return 0; } - public int doStep(XModelObject object) throws Exception { + public int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); actions = "true".equals(p2.getProperty("actions")); //$NON-NLS-1$ //$NON-NLS-2$ formbeans = "true".equals(p2.getProperty("formbeans")); //$NON-NLS-1$ //$NON-NLS-2$ @@ -208,7 +209,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); action_base = p2.getProperty("base class"); //$NON-NLS-1$ ////action_imports = p2.getProperty("imports"); @@ -246,7 +247,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(2); formbean_base = p2.getProperty("base class"); //$NON-NLS-1$ formbean_imports = p2.getProperty("imports"); //$NON-NLS-1$ @@ -282,7 +283,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(3); forward_base = p2.getProperty("base class"); //$NON-NLS-1$ forward_imports = p2.getProperty("imports"); //$NON-NLS-1$ @@ -314,7 +315,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); exception_base = p2.getProperty("base class"); //$NON-NLS-1$ exception_imports = p2.getProperty("imports"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -37,7 +37,7 @@ object.getAttributeValue(attr).length() > 0); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String attr = getJumpAttributeName(); XModelObject target = findForwardTarget(object, attr); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ StrutsProcessStructureHelper.instance.isItemFromOtherModule(object)); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject item = StrutsProcessStructureHelper.instance.findItemInOtherModule(object); if(item == null) return; if(item instanceof ReferenceObject) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -33,7 +33,7 @@ return (object != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String parameter = object.getAttributeValue("parameter"); if(parameter == null || parameter.length() == 0) return; String path = "/" + parameter.replace('.', '/') + ".properties"; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public ProcessItemHelpHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String key = object.getModelEntity().getName() + "_" + object.getAttributeValue(ATT_TYPE) + "_" + object.getAttributeValue(ATT_SUBTYPE); super.help(object.getModel(), key); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,7 @@ public class RenameStrutsConfigHandler extends DefaultEditHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { WebModulesHelper wh = WebModulesHelper.getInstance(object.getModel()); String module = "" + wh.getModuleForConfig(object); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -38,7 +38,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; StrutsProcessImpl process = (StrutsProcessImpl)object.getParent(); XModelObject parent = process.getParent().getChildByPath(ELM_ACTIONMAP); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,7 @@ return (object != null && object.isActive() && getItemInConfig(object) != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject item = getItemInConfig(object); if(item != null) FindObjectHelper.findModelObject(item, FindObjectHelper.EVERY_WHERE); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,7 @@ return (object != null && object.isActive()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject item = getItemOnProcess(object); if(item == null) return; FindObjectHelper.findModelObject(item, FindObjectHelper.IN_EDITOR_ONLY, "Diagram"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public SetUnknownActionHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (object == null) return; @@ -45,7 +45,7 @@ } } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -8,6 +8,7 @@ import org.jboss.tools.struts.model.*; import org.jboss.tools.common.meta.action.impl.handlers.CopyHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import java.util.Properties; @@ -22,7 +23,7 @@ public StrutsCopyHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (object instanceof ReferenceObjectImpl) { referentBuffer = object.getPath(); XModelObject ref = ((ReferenceObjectImpl)object).getReference(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -34,7 +34,7 @@ public StrutsDeleteHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { // Diagram object may be removed by update. if(object.getParent() == null) return; XModelObject process = StrutsProcessStructureHelper.instance.getProcess(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,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; SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.struts.ui.wizard.editproperties.StrutsEditPropertiesWizard"); StrutsEditPropertiesContext context = createContext(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -43,7 +43,7 @@ return TYPE_LINK.equals(tp) && super.isEnabled(object); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; if(isMoveOfLink(object)) { super.executeHandler(object, prop); @@ -72,7 +72,7 @@ return null; } - public void executeTransaction(XModelObject[] ps) throws Exception { + public void executeTransaction(XModelObject[] ps) throws XModelException { XUndoManager undo = ps[0].getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("move " + DefaultCreateHandler.title(ps[1], false), XTransactionUndo.EDIT); undo.addUndoable(u); @@ -80,7 +80,7 @@ transaction(ps); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.handlers.*; import org.jboss.tools.common.model.XModelBuffer; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.util.*; @@ -27,7 +28,7 @@ Properties _p = null; - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (prop == null) prop = new Properties(); _p = prop; if("true".equals(prop.getProperty("secondPass"))) { @@ -105,7 +106,7 @@ } - protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws Exception { + protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws XModelException { XModelObject o = parent.getModel().getModelBuffer().source(sourceIndex); String gui = p.getProperty("actionSourceGUIComponentID"); String entity = o.getModelEntity().getName(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ public UnlinkHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (!isEnabled(object)) return; String type = object.getAttributeValue(ATT_TYPE); if(TYPE_LINK.equals(type) && Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -16,6 +16,7 @@ import org.eclipse.osgi.util.NLS; 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.DeleteFileHandler; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -33,7 +34,7 @@ public DeletePageHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String target = object.getAttributeValue(ATT_NAME); if(!object.isActive()) return; if(StrutsProcessHelper.getReferers(object.getParent(), target).size() > 0) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public DeletePageLinkHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(new ReplaceConfirmedLinkHelper().replace(object, "", null)) p.setProperty("consumed", "true"); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,7 @@ //! 'short' is equivalent to 'no' - 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.jst.web.ui.wizards.links.HiddenLinksWizard"); XModelObject[] links = object.getChildren(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -28,7 +28,7 @@ return !pv.equals(object.getAttributeValue(pn)); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String pn = action.getProperty("property"); String pv = action.getProperty("value"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ SUBTYPE_TILE.equals(object.getAttributeValue(ATT_SUBTYPE))); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String path = object.getAttributeValue(ATT_PATH); XModelObject o = (XModelObject)TilesHelper.getTiles(object).get(path); if(o == null) return; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -30,11 +30,11 @@ return object.isObjectEditable() && "page".equals(object.getAttributeValue("type")); //$NON-NLS-1$ //$NON-NLS-2$ } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { Properties p = extractProperties(data[0]); String oldpath = object.getAttributeValue("path"); //$NON-NLS-1$ String path = p.getProperty("path"); //$NON-NLS-1$ - if(path.equals("/")) throw new Exception("Path is not valid."); //$NON-NLS-1$ //$NON-NLS-2$ + if(path.equals("/")) throw new XModelException("Path is not valid."); //$NON-NLS-1$ //$NON-NLS-2$ boolean isTile = oldpath != null && !oldpath.startsWith("/"); //$NON-NLS-1$ if(!isTile && !path.startsWith("/")) path = "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ if(path.startsWith("/") && path.indexOf('.') < 0) path += ".jsp"; //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -44,7 +44,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; getContext().execute(object); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -21,6 +21,7 @@ import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; 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.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; @@ -82,7 +83,7 @@ } } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { finish(); setFinished(true); @@ -95,7 +96,7 @@ } } - private void callSelector() throws Exception { + private void callSelector() throws XModelException { String b = getValidatedName(false); if(b != null && b.endsWith("/")) b = b.substring(0, b.length() - 1); XModelObject so = (b == null || b.length() == 0) ? null : getTarget().getModel().getByPath(b); @@ -116,7 +117,7 @@ onSelection(); } - private void onSelection() throws Exception { + private void onSelection() throws XModelException { XModelObject so = (XModelObject)getProperties().get("selectedObject"); if(so != null) { String p = XModelObjectLoaderUtil.getResourcePath(so); @@ -170,7 +171,7 @@ return b; } - private void finish() throws Exception { + private void finish() throws XModelException { getValidatedName(true); extractStepData(getStepId()); context.update(); @@ -181,7 +182,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.model.handlers.page.create; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public class SelectPageSupport extends SpecialWizardSupport { @@ -23,7 +24,7 @@ if(context != null) setAttributeContext(0, "name", context); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { extractStepData(0); getProperties().setProperty("name", getAttributeValue(0, "name")); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,12 +11,13 @@ package org.jboss.tools.struts.model.handlers.page.create; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public class WebSupport extends SpecialWizardSupport { public WebSupport() {} - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); } else if(CANCEL.equals(name)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -77,7 +77,7 @@ p.put("tiles", tiles); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -129,7 +129,7 @@ return (a == null || actions == null) ? "" : actions.getModule(a); } - protected void finish() throws Exception { + protected void finish() throws XModelException { XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("create forward in " + DefaultCreateHandler.title(getTarget(), false), XTransactionUndo.ADD); undo.addUndoable(u); @@ -137,7 +137,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -28,7 +28,7 @@ return handler.isEnabled(object); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { execute(); setFinished(true); @@ -41,7 +41,7 @@ return new String[]{FINISH, CANCEL, HELP}; } - void execute() throws Exception { + void execute() throws XModelException { handler.executeHandler(getTarget(), getProperties()); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -105,7 +105,7 @@ pkg + "SelectActionForwardPathStep"; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); setStepId(-1); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -54,7 +54,7 @@ return null; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); } else if(CANCEL.equals(name)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,7 @@ public class DeleteModuleHandler extends AbstractHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { StrutsProjectModule pm = (StrutsProjectModule)object; XModelObject m = pm.getModule(); if(m == null) return; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -31,7 +31,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject rso = getTemplate(PreferenceModelUtilities.getPreferenceModel()); if(rso == null) return; String text = rso.getAttributeValue("text"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -35,7 +35,7 @@ return rs != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject[] os = OpenMessageResourcesHandler.getResourceObject(object); if(os == null || os.length == 0) return; object = os[0]; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -50,7 +50,7 @@ } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject plugin = getPlugin(PreferenceModelUtilities.getPreferenceModel()); if(plugin == null) return; String text = plugin.getAttributeValue("text"); //$NON-NLS-1$ @@ -84,7 +84,7 @@ return (i < ps.length) ? ps[i] : null; } - private Element getElement(String text) throws Exception { + private Element getElement(String text) { StringReader sr = new StringReader(text); return XMLUtil.getElement(sr); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,7 @@ return StrutsUIMessages.LEAVE_FIELDS_EMPTY; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(CANCEL.equals(name)) { setFinished(true); } else if(OK.equals(name) || FINISH.equals(name)) { @@ -35,7 +35,7 @@ } } - private void finish() throws Exception { + private void finish() throws XModelException { Properties p0 = extractStepData(0); XModelObject fs = findFormset(getTarget(), p0); if(fs != null) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,7 +32,7 @@ if(n != null) setAttributeValue(0, "name", n); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { execute(); setFinished(true); @@ -45,7 +45,7 @@ return "true".equals(action.getProperty("edit")); } - private void execute() throws Exception { + private void execute() throws XModelException { Properties p0 = extractStepData(0); if(isEditMode()) { DefaultEditHandler.edit(getTarget(), p0, getTarget().isActive()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,7 @@ return 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.struts.validator.ui.wizard.depends.DependencyWizard"); if(wizard==null) throw new NullPointerException("Cannot find wizard class 'org.jboss.tools.struts.validator.ui.wizard.depends.DependencyWizard'."); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,7 +32,7 @@ if(n != null) setAttributeValue(0, "name", n); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { execute(); setFinished(true); @@ -45,7 +45,7 @@ return "true".equals(action.getProperty("edit")); } - private void execute() throws Exception { + private void execute() throws XModelException { Properties p0 = extractStepData(0); if(isEditMode()) { DefaultEditHandler.edit(getTarget(), p0, getTarget().isActive()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -27,7 +27,7 @@ // setAttributeValue(0, "register", (canRegisterInternal()) ? "yes" : "no"); } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p0 = extractStepData(0); XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("Create tiles " + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD); @@ -42,7 +42,7 @@ } } - private void doExecute(Properties p0) throws Exception { + private void doExecute(Properties p0) throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); path = revalidatePath(path); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.Properties; 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.DeleteFileHandler; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -20,7 +21,7 @@ public class DeleteValidationFileHandler extends DeleteFileHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { boolean unregister = false; if(ValidatorRegistrationHelper.getInstance().isRegistered(object.getModel(), object)) { String checkboxMessage = StrutsUIMessages.DELETE_REFERENCE; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,7 @@ return 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; if(p == null) return; String nm = p.getProperty("dependency name"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,13 +13,14 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.XActionInvoker; 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.FileAnyImpl; import org.jboss.tools.struts.validators.model.helpers.ValidatorRegistrationHelper; public class RenameValidationFileHandler 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(); String oldPath = ((FileAnyImpl)object).getAbsolutePath(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -69,7 +69,7 @@ return 0; } - public int doStep(XModelObject object) throws Exception { + public int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String name = p2.getProperty("name"); //$NON-NLS-1$ String version = p2.getProperty("version"); //$NON-NLS-1$ @@ -134,7 +134,7 @@ } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); String location = p2.getProperty("location"); //$NON-NLS-1$ String template = p2.getProperty("template"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -27,7 +27,7 @@ return false; } - 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.jst.web.ui.wizards.appregister.AppRegisterWizard"); if(p == null) p = new Properties(); p.setProperty("title", action.getDisplayName()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; import org.jboss.tools.common.meta.action.impl.XActionImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.server.RegistrationHelper; @@ -35,7 +36,7 @@ return object != null && isRegistered(object); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { // String name = "/" + object.getAttributeValue("application name"); RegistrationHelper.unregister(EclipseResourceUtil.getProject(object)); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,7 @@ prepareStep(target, getStepId()); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if (NEXT.equals(name)) { int step = getStepId(); try { @@ -116,7 +116,7 @@ return getStep(stepId).prepareStep(object); } - public int doStep(XModelObject object, int stepId) throws Exception { + public int doStep(XModelObject object, int stepId) throws XModelException { return getStep(stepId).doStep(object); } @@ -126,7 +126,7 @@ public interface Step { public int prepareStep(XModelObject object); - public int doStep(XModelObject object) throws Exception; + public int doStep(XModelObject object) throws XModelException; public int undoStep(XModelObject object); public String getTitle(); public String[] getActionNames(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.webprj.model.helpers.adopt; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public abstract class AWStep { protected SpecialWizardSupport support; @@ -36,7 +37,7 @@ context = ((AdoptProjectSupport)support).context(); } - public int onNext() throws Exception { + public int onNext() throws XModelException { support.extractStepData(id); validate(); return id + 1; @@ -46,9 +47,9 @@ public void set() {} - protected void validate() throws Exception {} + protected void validate() throws XModelException {} - public void action(String name) throws Exception {} + public void action(String name) throws XModelException {} public String getMessage() { return null; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -17,6 +17,7 @@ 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.util.FileUtil; import org.jboss.tools.jst.web.context.IImportWebProjectContext; @@ -38,7 +39,7 @@ this.model = model; } - public void execute() throws Exception { + public void execute() throws XModelException { filesystems.clear(); workspace = context.getWebInfLocation(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,8 @@ import java.io.*; +import org.jboss.tools.common.model.XModelException; + public class AdoptProjectStepFolders extends AWStep { public String getTitle() { @@ -24,7 +26,7 @@ "Ant Build File"; } - protected void validate() throws Exception { + protected void validate() throws XModelException { String bf = support.getAttributeValue(3, "build"); File f = new File(bf); if(f.isFile()) f = f.getParentFile(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; import org.jboss.tools.jst.web.project.helpers.NewWebProjectHelper; @@ -33,7 +34,7 @@ return StrutsUIMessages.ENTER_PATH_TO_THE_FOLDER_WHERE_STRUTSCONFIGXML_IS_LOCATED; } - public int onNext() throws Exception { + public int onNext() throws XModelException { support.extractStepData(id); String location = support.getAttributeValue(id, "location"); //$NON-NLS-1$ File f = new File(location); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.webprj.model.helpers.adopt; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AdoptProjectStepModules extends AWStep { @@ -18,7 +19,7 @@ return StrutsUIMessages.ADOPT_PROJECTS_TEPMODULES; } - public void validate() throws Exception { + public void validate() throws XModelException { context.validateModules(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.webprj.model.helpers.adopt; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AdoptProjectStepName extends AWStep { @@ -22,7 +23,7 @@ return ("name".equals(name)) ? "Application Name*" : "web.xml Location*"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - public void validate() throws Exception { + public void validate() throws XModelException { context.setWebXMLLocation(support.getAttributeValue(id, "web.xml location")); //$NON-NLS-1$ } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.StrutsModelPlugin; public class AdoptProjectSupport extends SpecialWizardSupport { @@ -85,7 +86,7 @@ new String[]{}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { steps[getStepId()].onNext(); finish(); @@ -105,7 +106,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { Properties properties = getProperties(); if ("yes".equals(properties.getProperty("returnData"))) properties.put("context", context); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.ArrayList; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.struts.StrutsProject; import org.jboss.tools.jst.web.context.ImportWebWarContext; @@ -31,12 +32,12 @@ createAllModules(); } - protected void loadWebXML(String body, String location) throws Exception { + protected void loadWebXML(String body, String location) throws XModelException { super.loadWebXML(body, location); String[][] ms = AdoptProjectContext.getModules(webxml); if(ms == null || ms.length == 0) { String webXMLErrorMessage = "No Struts support found in the project."; - throw new Exception(webXMLErrorMessage); + throw new XModelException(webXMLErrorMessage); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AddModuleSupport extends SpecialWizardSupport { @@ -22,7 +23,7 @@ context = (SyncProjectContext)p.get("context"); //$NON-NLS-1$ } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -34,7 +35,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { Properties p0 = extractStepData(0); String name = p0.getProperty("name"); //$NON-NLS-1$ String path = p0.getProperty("path").replace('\\', '/'); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,6 +32,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.filesystems.XFileObject; import org.jboss.tools.common.model.undo.XTransactionUndo; @@ -237,15 +238,15 @@ return XModelObjectUtil.getExpandedValue(fs, "location", null) + modelPath; //$NON-NLS-1$ } - void addModule(String name, String path) throws Exception { + void addModule(String name, String path) throws XModelException { File f = new File(path); - if(!f.isFile()) throw new Exception("File " + " does not exist."); //$NON-NLS-1$ //$NON-NLS-2$ + if(!f.isFile()) throw new XModelException("File " + " does not exist."); //$NON-NLS-1$ //$NON-NLS-2$ String uri = "/WEB-INF/" + f.getName(); //$NON-NLS-1$ if(name.length() > 0 && !name.startsWith("/")) name = "/" + name; //$NON-NLS-1$ //$NON-NLS-2$ XModelObject m = (XModelObject)modulesMap.get(name); if(m != null) { if("deleted".equals(m.get("state"))) { //$NON-NLS-1$ //$NON-NLS-2$ - if(m != null) throw new Exception("Module " + getModuleDisplayName(name) + " exists."); //$NON-NLS-1$ //$NON-NLS-2$ + if(m != null) throw new XModelException("Module " + getModuleDisplayName(name) + " exists."); //$NON-NLS-1$ //$NON-NLS-2$ } checkStrutsConfig(path); XModelObject cc = m.getModel().createModelObject(WebModuleConstants.ENTITY_WEB_CONFIG, null); //$NON-NLS-1$ @@ -258,7 +259,7 @@ XModelObjectLoaderUtil.mergeAttributes(cc1, cc, false); cc1.set("state", "added"); //$NON-NLS-1$ //$NON-NLS-2$ } else { - throw new Exception("Configuration file is used."); //$NON-NLS-1$ + throw new XModelException("Configuration file is used."); //$NON-NLS-1$ } } else { m.addChild(cc); @@ -269,7 +270,7 @@ m = findModuleByPathOnDisk(path); if(m != null) { if(!"deleted".equals(m.get("state"))) //$NON-NLS-1$ //$NON-NLS-2$ - throw new Exception("The path is used by another module."); //$NON-NLS-1$ + throw new XModelException("The path is used by another module."); //$NON-NLS-1$ modules.remove(m); modulesMap.remove(name); } else { @@ -329,22 +330,22 @@ return null; } - private void checkStrutsConfig(String path) throws Exception { + private void checkStrutsConfig(String path) throws XModelException { File f = new File(path); - if(!f.isFile()) throw new Exception("Path is not a path to a file."); //$NON-NLS-1$ + if(!f.isFile()) throw new XModelException("Path is not a path to a file."); //$NON-NLS-1$ String s = FileUtil.readFile(f); boolean is11 = s.indexOf(StrutsConstants.DOC_PUBLICID_11) >= 0; boolean is12 = s.indexOf(StrutsConstants.DOC_PUBLICID_12) >= 0; if(!is11 && !is12) - throw new Exception("File is not Struts Configuration 1.1 or 1.2."); //$NON-NLS-1$ + throw new XModelException("File is not Struts Configuration 1.1 or 1.2."); //$NON-NLS-1$ String[] es = XMLUtil.getXMLErrors(new StringReader(s), false); //never validate dtd if(es != null && es.length > 0) { String version = (is11) ? "1.1" : "1.2"; //$NON-NLS-1$ //$NON-NLS-2$ - throw new Exception("Struts Configuration " + version + " file is not correct:\n" + es[0]); //$NON-NLS-1$ //$NON-NLS-2$ + throw new XModelException("Struts Configuration " + version + " file is not correct:\n" + es[0]); //$NON-NLS-1$ //$NON-NLS-2$ } } - public boolean apply() throws Exception { + public boolean apply() throws XModelException { validateAttributes(); if(!checkNewPaths()) return false; XUndoManager undo = model.getUndoManager(); @@ -354,7 +355,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } @@ -612,21 +613,21 @@ return adoptOrCreateFileSystem(name, location, info); } - private void validateAttributes() throws Exception { + private void validateAttributes() throws XModelException { validateAttr(ATTR_URI); validateAttr(ATTR_DISK_PATH); validateAttr(ATTR_ROOT); } - private void validateAttr(String attr) throws Exception { + private void validateAttr(String attr) throws XModelException { Set<String> set = new HashSet<String>(); for (int i = 0; i < modules.size(); i++) { XModelObject o = (XModelObject)modules.get(i); if("deleted".equals(o.get("state"))) continue; //$NON-NLS-1$ //$NON-NLS-2$ String v = o.getAttributeValue(attr); if(v == null) continue; - if(v.length() == 0) throw new Exception("Attribute '" + attr + "' is required."); //$NON-NLS-1$ //$NON-NLS-2$ - if(set.contains(v)) throw new Exception("More than one module has '" + attr + "' set to " + v + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if(v.length() == 0) throw new XModelException("Attribute '" + attr + "' is required."); //$NON-NLS-1$ //$NON-NLS-2$ + if(set.contains(v)) throw new XModelException("More than one module has '" + attr + "' set to " + v + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ set.add(v); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -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.util.EclipseResourceUtil; import org.jboss.tools.struts.StrutsProject; @@ -60,7 +61,7 @@ return new String[]{FINISH, CANCEL, HELP}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { /// steps[getStepId()].onNext(); if(!finish()) return; @@ -76,7 +77,7 @@ } } - protected boolean finish() throws Exception { + protected boolean finish() throws XModelException { return context.apply(); }

18 years

1
0
0 / 0

JBoss Tools SVN: r7076 - in trunk/common/plugins/org.jboss.tools.common.verification: src/org/jboss/tools/common/verification/vrules/core/resources and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:54:24 -0400 (Mon, 24 Mar 2008) New Revision: 7076 Modified: trunk/common/plugins/org.jboss.tools.common.verification/.classpath trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java Log: JBIDE-893 Modified: trunk/common/plugins/org.jboss.tools.common.verification/.classpath =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/.classpath 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/.classpath 2008-03-24 14:54:24 UTC (rev 7076) @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="resources/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="/org.jboss.tools.common.model.ui"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="src" path="resources/"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -40,7 +40,9 @@ try { XModelObject o = FileSystemsHelper.getWebInf(n.getModel()); clear(o); - } catch (Exception e) {} + } catch (Exception e) { + ModelPlugin.getPluginLog().logError(e); + } } } Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -17,6 +17,7 @@ import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.markers.ResourceProblems; import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.PositionHolder; import org.jboss.tools.common.verification.vrules.*; import org.jboss.tools.common.verification.vrules.layer.VObjectImpl; @@ -120,9 +121,11 @@ if(o == null) return limit = -1; String s = o.getAttributeValue(attr); limit = -1; - if(!"unlimited".equals(s)) try { + if(!"unlimited".equals(s) && s != null && s.length() > 0) try { limit = Integer.parseInt(s); - } catch (Exception e) {} + } catch (NumberFormatException e) { + ModelPlugin.getPluginLog().logError(e); + } return limit; } Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -28,7 +28,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(p == null) p = new Properties(); wizard.setObject(new Object[]{object, p}); wizard.execute(); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -23,7 +23,7 @@ public VerifyRuleHandler() { } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (!isEnabled(object)) return; VModel vmodel = VModelFactory.getModel(object.getModel()); Map<String,List<VRule>> entities = new HashMap<String,List<VRule>>(); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -23,7 +23,7 @@ public VerifyRuleSetAllHandler() { } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (!isEnabled(object)) return; VModel vmodel = VModelFactory.getModel(object.getModel()); Map<String,List<VRule>> entities = new HashMap<String,List<VRule>>(); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -23,7 +23,7 @@ public VerifyRuleSetHandler() { } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (!isEnabled(object)) return; VModel vmodel = VModelFactory.getModel(object.getModel()); VObject vobject = vmodel.getObjectByPath(object.getPath()); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -23,7 +23,7 @@ public VerifyRulesAllHandler() { } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!gui) executeHandlerDefault(object, p); else executeHandlerGUI(object, p); } @@ -32,7 +32,7 @@ return VHelper.getManager() != null; } - private void executeHandlerDefault(XModelObject object, Properties p) throws Exception { + private void executeHandlerDefault(XModelObject object, Properties p) throws XModelException { if (!isEnabled(object)) return; VModel vmodel = VModelFactory.getModel(object.getModel()); Map<String,List<VRule>> entities = new HashMap<String,List<VRule>>(); @@ -60,7 +60,7 @@ } - private void executeHandlerGUI(XModelObject object, Properties p) throws Exception { + private void executeHandlerGUI(XModelObject object, Properties p) throws XModelException { SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.verification.ui.vrules.wizard.runtime2.VerifyWizard"); if(p == null) p = new Properties(); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -21,7 +21,7 @@ public VerifyRulesHandler() { } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (!isEnabled(object)) return; VModel vmodel = VModelFactory.getModel(object.getModel()); VObject vobject = vmodel.getObjectByPath(object.getPath()); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -49,9 +49,14 @@ VHelper.setManager(this); manager.setMessageFormat(new VMessageFormat(getBundle(getAttributeValue("bundle")).getString(getAttributeValue("format id")))); manager.setRuleSets(getRuleSets()); + String s = getAttributeValue("minimum significance"); try { - manager.setMinSignificance(Integer.parseInt(getAttributeValue("minimum significance"))); - } catch (NumberFormatException e) {} + if(s != null && s.length() > 0) { + manager.setMinSignificance(Integer.parseInt(s)); + } + } catch (NumberFormatException e) { + ModelPlugin.getPluginLog().logError(e); + } developer = "developer".equals(getAttributeValue("mode")); manager.addPropertyChangeListener(this); } @@ -125,8 +130,12 @@ developer = "developer".equals(getAttributeValue("mode")); } else if ("minimum significance".equals(name)) { try { - manager.setMinSignificance(Integer.parseInt(result)); - } catch (NumberFormatException e) {} + if(result != null && result.length() > 0) { + manager.setMinSignificance(Integer.parseInt(result)); + } + } catch (NumberFormatException e) { + ModelPlugin.getPluginLog().logError(e); + } } } return result; Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -31,9 +31,12 @@ template.setName(getAttributeValue("name")); template.setDescription(getAttributeValue("description")); template.setType(getAttributeValue("type")); + String s = getAttributeValue("significance"); try { - template.setSignificance(Integer.parseInt(getAttributeValue("significance"))); - } catch (NumberFormatException e) {} + template.setSignificance(Integer.parseInt(s)); + } catch (NumberFormatException e) { + //ignore + } template.setFormat(getFormat(getAttributeValue("message id"), rule)); template.addPropertyChangeListener(this); } @@ -58,7 +61,9 @@ } else if ("significance".equals(name)) { try { template.setSignificance(Integer.parseInt(result)); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + //ignore + } } else if ("message id".equals(name)) { template.setFormat(getFormat(result, ((VRuleModel)getParent()).getRule(null))); } Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -119,7 +119,9 @@ } else if ("significance".equals(name)) { try { rule.setSignificance(Integer.parseInt(result)); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + //ignore + } } else if ("entities".equals(name)) { VEntity[] oldEntities = rule.getEntities(); VEntity[] newEntities = getEntities(result); Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2008-03-24 14:53:57 UTC (rev 7075) +++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2008-03-24 14:54:24 UTC (rev 7076) @@ -43,7 +43,9 @@ try { if(url != null) url = FileLocator.resolve(url); if(url != null) l.add(url); - } catch (Exception e) {} + } catch (IOException e) { + ModelPlugin.getPluginLog().logError(e); + } } it = l.iterator(); while(it.hasNext()) {

18 years

1
0
0 / 0

JBoss Tools SVN: r7075 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action: adf and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:53:57 -0400 (Mon, 24 Mar 2008) New Revision: 7075 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java Log: JBIDE-893 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java 2008-03-24 14:53:47 UTC (rev 7074) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java 2008-03-24 14:53:57 UTC (rev 7075) @@ -17,6 +17,7 @@ import org.eclipse.ui.*; import org.osgi.framework.Bundle; 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.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -48,11 +49,24 @@ return hasNature ? REMOVE_CLASS_NAME : ADD_CLASS_NAME; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { Bundle b = Platform.getBundle(PLUGIN_ID); if(b == null) return; - Class c = b.loadClass(getClassName(object)); - IObjectActionDelegate actionDelegate = (IObjectActionDelegate)c.newInstance(); + + Class c = null; + try { + c = b.loadClass(getClassName(object)); + } catch (ClassNotFoundException e) { + throw new XModelException(e); + } + IObjectActionDelegate actionDelegate = null; + try { + actionDelegate = (IObjectActionDelegate)c.newInstance(); + } catch (InstantiationException e1) { + throw new XModelException(e1); + } catch (IllegalAccessException e2) { + throw new XModelException(e2); + } Action action = new Action() {}; action.setEnabled(true); IWorkbenchPart part = ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java 2008-03-24 14:53:47 UTC (rev 7074) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java 2008-03-24 14:53:57 UTC (rev 7075) @@ -335,7 +335,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/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java 2008-03-24 14:53:47 UTC (rev 7074) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java 2008-03-24 14:53:57 UTC (rev 7075) @@ -10,8 +10,10 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.action.adf; +import java.lang.reflect.InvocationTargetException; import java.util.*; 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 AddADFSupportHandler extends AbstractHandler { @@ -22,8 +24,15 @@ return helper.isEnabled(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { - if(isEnabled(object)) helper.execute(); + public void executeHandler(XModelObject object, Properties p) throws XModelException { + if(!isEnabled(object)) return; + try { + helper.execute(); + } catch (InvocationTargetException e1) { + throw new XModelException(e1); + } catch (InterruptedException e2) { + throw new XModelException(e2); + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-03-24 14:53:47 UTC (rev 7074) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-03-24 14:53:57 UTC (rev 7075) @@ -65,7 +65,7 @@ return false; } - public void execute() throws Exception { + public void execute() throws InvocationTargetException, InterruptedException { ModelPlugin.getDefault().getWorkbench().getProgressService().run(false, true, new RunImpl()); }

18 years

1
0
0 / 0

JBoss Tools SVN: r7074 - in trunk/struts/plugins/org.jboss.tools.struts.ui: src/org/jboss/tools/struts/ui/internal/action and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:53:47 -0400 (Mon, 24 Mar 2008) New Revision: 7074 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/resources/help/keys.properties trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/CreateStrutsProjectHandler.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportStrutsProjectHandler.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/CreateEclipseProjectHandler.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/ImportEclipseProjectHandler.java Log: JBIDE-893 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/resources/help/keys.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/resources/help/keys.properties 2008-03-24 14:53:28 UTC (rev 7073) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/resources/help/keys.properties 2008-03-24 14:53:47 UTC (rev 7074) @@ -9,8 +9,8 @@ FileTLD_1_2=/struts/FileTLD_1_2.html FileTLD_1_2_Properties=/struts/FileTLD_1_2_Properties.html -FileTLD_1_2_Properties.WindowTitle=Edit Properties -FileTLD_1_2_Properties.Title=File tld +FileTLD_1_2_Properties.WindowTitle=Properties +FileTLD_1_2_Properties.Title=File TLD FileTLD_1_2_CreateListener=/struts/FileTLD_1_2_CreateListener.html FileTLD_1_2_CreateListener.WindowTitle=Add Listener @@ -27,7 +27,7 @@ FileTLD_PRO=/struts/FileTLD.html FileTLD_PRO_Properties=/struts/FileTLD_Properties.html -FileTLD_PRO_Properties.WindowTitle=Edit Properties +FileTLD_PRO_Properties.WindowTitle=Properties FileTLD_PRO_Properties.Title=File TLD FileTLD_PRO_CreateTag=/struts/FileTLD_CreateTag.html @@ -39,7 +39,7 @@ TLDTag=/struts_pro/TLDTag.html TLDTag_Properties=/struts_pro/TLDTag_Properties.html -TLDTag_Properties.WindowTitle=Edit Properties +TLDTag_Properties.WindowTitle=Properties TLDTag_Properties.Title=TLD Tag TLDTag_CreateAttribute=/struts_pro/TLDTag_CreateAttribute.html @@ -49,7 +49,7 @@ TLDTag12=/struts_pro/TLDTag12.html TLDTag12_Properties=/struts_pro/TLDTag12_Properties.html -TLDTag12_Properties.WindowTitle=Edit Properties +TLDTag12_Properties.WindowTitle=Properties TLDTag12_Properties.Title=TLD Tag TLDTag12_CreateVariable=/struts_pro/TLDTag12_CreateVariable.html @@ -65,21 +65,21 @@ TLDAttribute=/struts_pro/TLDAttribute.html TLDAttribute_Properties=/struts_pro/TLDAttribute_Properties.html -TLDAttribute_Properties.WindowTitle=Edit Properties +TLDAttribute_Properties.WindowTitle=Properties TLDAttribute_Properties.Title=TLD Attribute TLDAttribute12=/struts_pro/TLDAttribute12.html TLDAttribute12_Properties=/struts_pro/TLDAttribute12_Properties.html -TLDAttribute12_Properties.WindowTitle=Edit Properties -TLDAttribute12_Properties.Title=Tld Attribute +TLDAttribute12_Properties.WindowTitle=Properties +TLDAttribute12_Properties.Title=TLD Attribute ##### TLD 1.2 Variable ##### TLDVariable=/struts_pro/TLDVariable.html TLDVariable_Properties=/struts_pro/TLDVariable_Properties.html -TLDVariable_Properties.WindowTitle=Edit Properties +TLDVariable_Properties.WindowTitle=Properties TLDVariable_Properties.Title=TLD Variable TLDVariable_CreateInitParam=/struts_pro/WebAppServlet_CreateInitParam.html @@ -91,7 +91,7 @@ TLDValidator=/struts_pro/TLDValidator.html TLDValidator_Properties=/struts_pro/TLDValidator.html -TLDValidator_Properties.WindowTitle=Edit Properties +TLDValidator_Properties.WindowTitle=Properties TLDValidator_Properties.Title=TLD Validator TLDValidator_CreateInitParam=/struts_pro/WebAppServlet_CreateInitParam.html @@ -102,7 +102,7 @@ TLDListener=/struts_pro/TLDListener.html TLDListener_Properties=/struts_pro/TLDListener.html -TLDListener_Properties.WindowTitle=Edit Properties +TLDListener_Properties.WindowTitle=Properties TLDListener_Properties.Title=TLD Listener ##### TLD Taglib element ##### @@ -110,7 +110,7 @@ TLDTaglib=/model/noHelpYet.html TLDTaglib_Properties=/model/noHelpYet.html -TLDTaglib_Properties.WindowTitle=Edit Properties +TLDTaglib_Properties.WindowTitle=Properties TLDTaglib_Properties.Title=TLD Taglib TLDTaglib_CreateTag=/model/noHelpYet.html @@ -123,7 +123,7 @@ FileTiles=/struts_pro/FileTiles.html FileTiles_Properties=/struts_pro/FileTiles_Properties.html -FileTiles_Properties.WindowTitle=Edit Properties +FileTiles_Properties.WindowTitle=Properties FileTiles_Properties.Title=File Tiles FileTiles_CreateDefinition=/struts_pro/FileTiles_CreateDefinition.html @@ -145,7 +145,7 @@ TilesAdd=/struts_pro/TilesAdd.html TilesAdd_Properties=/struts_pro/TilesAdd.html -TilesAdd_Properties.WindowTitle=Edit Properties +TilesAdd_Properties.WindowTitle=Properties TilesAdd_Properties.Title=Tiles Add ##### Tiles Bean element ##### @@ -153,7 +153,7 @@ TilesBean=/struts_pro/TilesBean.html TilesBean_Properties=/struts_pro/TilesBean.html -TilesBean_Properties.WindowTitle=Edit Properties +TilesBean_Properties.WindowTitle=Properties TilesBean_Properties.Title=Tiles Bean TilesBean_CreateSetProperty=/struts/CreateSetProperty.html @@ -165,7 +165,7 @@ TilesDefinition=/struts_pro/TilesDefinition.html TilesDefinition_Properties=/struts_pro/TilesDefinition_Properties.html -TilesDefinition_Properties.WindowTitle=Edit Properties +TilesDefinition_Properties.WindowTitle=Properties TilesDefinition_Properties.Title=Tiles Definition TilesDefinition_CreatePut=/struts_pro/TilesDefinition_CreatePut.html @@ -180,7 +180,7 @@ TilesItem=/struts_pro/TilesItem.html TilesItem_Properties=/struts_pro/TilesItem.html -TilesItem_Properties.WindowTitle=Edit Properties +TilesItem_Properties.WindowTitle=Properties TilesItem_Properties.Title=Tiles Item ##### Tiles List element ##### @@ -188,7 +188,7 @@ TilesList=/struts_pro/TilesList.html TilesList_Properties=/struts_pro/TilesList_Properties.html -TilesList_Properties.WindowTitle=Edit Properties +TilesList_Properties.WindowTitle=Properties TilesList_Properties.Title=Tiles List TilesList_CreateAdd=/struts_pro/TilesList_CreateAdd.html @@ -212,7 +212,7 @@ TilesPut=/struts_pro/TilesPut.html TilesPut_Properties=/struts_pro/TilesPut_Properties.html -TilesPut_Properties.WindowTitle=Edit Properties +TilesPut_Properties.WindowTitle=Properties TilesPut_Properties.Title=Tiles Put ##### File web.xml ##### @@ -220,7 +220,7 @@ FileWebApp=/struts_pro/FileWebApp.html FileWebApp_Properties=/struts_pro/FileWebApp_Properties.html -FileWebApp_Properties.WindowTitle=Edit Properties +FileWebApp_Properties.WindowTitle=Properties FileWebApp_Properties.Title=File Web Descriptor @@ -289,7 +289,7 @@ WebAppAuthConstraint=/struts_pro/WebAppAuthConstraint.html WebAppAuthConstraint_Properties=/struts_pro/WebAppAuthConstraint_Properties.html -WebAppAuthConstraint_Properties.WindowTitle=Edit Properties +WebAppAuthConstraint_Properties.WindowTitle=Properties WebAppAuthConstraint_Properties.Title=Web Auth Constraint WebAppAuthConstraint_CreateRole=/struts_pro/WebAppAuthConstraint_CreateRole.html @@ -301,7 +301,7 @@ WebAppContextParam=/struts_pro/WebAppContextParam.html WebAppContextParam_Properties=/struts_pro/WebAppContextParam.html -WebAppContextParam_Properties.WindowTitle=Edit Properties +WebAppContextParam_Properties.WindowTitle=Properties WebAppContextParam_Properties.Title=Web Context Param ##### web ejb-ref element ##### @@ -309,7 +309,7 @@ WebAppEjbRef=/struts_pro/WebAppEjbRef.html WebAppEjbRef_Properties=/struts_pro/WebAppEjbRef.html -WebAppEjbRef_Properties.WindowTitle=Edit Properties +WebAppEjbRef_Properties.WindowTitle=Properties WebAppEjbRef_Properties.Title=Web Ejb Ref ##### web env-entry element ##### @@ -317,7 +317,7 @@ WebAppEnvEntry=/struts_pro/WebAppEnvEntry.html WebAppEnvEntry_Properties=/struts_pro/WebAppEnvEntry.html -WebAppEnvEntry_Properties.WindowTitle=Edit Properties +WebAppEnvEntry_Properties.WindowTitle=Properties WebAppEnvEntry_Properties.Title=Web Env Entry ##### web error-page element ##### @@ -325,14 +325,14 @@ WebAppErrorPage=/struts_pro/WebAppErrorPage.html WebAppErrorPage_Properties=/struts_pro/WebAppErrorPage.html -WebAppErrorPage_Properties.WindowTitle=Edit Properties +WebAppErrorPage_Properties.WindowTitle=Properties WebAppErrorPage_Properties.Title=Web Error Page ##### web init-param element ##### WebAppInitParam=/struts_pro/WebAppInitParam.html WebAppInitParam_Properties=/struts_pro/WebAppInitParam.html -WebAppInitParam_Properties.WindowTitle=Edit Properties +WebAppInitParam_Properties.WindowTitle=Properties WebAppInitParam_Properties.Title=Web Init Param @@ -341,14 +341,14 @@ WebAppLoginConfig=/struts_pro/WebAppLoginConfig.html WebAppLoginConfig_Properties=/struts_pro/WebAppLoginConfig.html -WebAppLoginConfig_Properties.WindowTitle=Edit Properties +WebAppLoginConfig_Properties.WindowTitle=Properties WebAppLoginConfig_Properties.Title=Web Login Config ##### web mime-mapping element ##### WebAppMimeMapping=/struts_pro/WebAppMimeMapping.html -WebAppMimeMapping_Properties.WindowTitle=Edit Properties +WebAppMimeMapping_Properties.WindowTitle=Properties WebAppMimeMapping_Properties=/struts_pro/WebAppMimeMapping.html WebAppMimeMapping_Properties.Title=Web Mime Mapping @@ -357,7 +357,7 @@ WebAppResourceCollection=/struts_pro/WebAppResourceCollection.html WebAppResourceCollection_Properties=/struts_pro/WebAppResourceCollection.html -WebAppResourceCollection_Properties.WindowTitle=Edit Properties +WebAppResourceCollection_Properties.WindowTitle=Properties WebAppResourceCollection_Properties.Title=Web Resource Collection ##### web resource-ref element ##### @@ -365,7 +365,7 @@ WebAppResourceRef=/struts_pro/WebAppResourceRef.html WebAppResourceRef_Properties=/struts_pro/WebAppResourceRef.html -WebAppResourceRef_Properties.WindowTitle=Edit Properties +WebAppResourceRef_Properties.WindowTitle=Properties WebAppResourceRef_Properties.Title=Web Resource Ref ##### web security-constraint element ##### @@ -373,7 +373,7 @@ WebAppSecurityConstraint=/struts_pro/WebAppSecurityConstraint.html WebAppSecurityConstraint_Properties=/struts_pro/WebAppSecurityConstraint_Properties.html -WebAppSecurityConstraint_Properties.WindowTitle=Edit Properties +WebAppSecurityConstraint_Properties.WindowTitle=Properties WebAppSecurityConstraint_Properties.Title=Web Security Constraint WebAppSecurityConstraint_CreateResourceCollection=/struts_pro/WebAppSecurityConstraint_CreateResourceCollection.html @@ -393,7 +393,7 @@ WebAppSecurityRole=/struts_pro/WebAppSecurityRole.html WebAppSecurityRole_Properties=/struts_pro/WebAppSecurityRole.html -WebAppSecurityRole_Properties.WindowTitle=Edit Properties +WebAppSecurityRole_Properties.WindowTitle=Properties WebAppSecurityRole_Properties.Title=Web Security Role ##### web security-role-ref element ##### @@ -401,7 +401,7 @@ WebAppSecurityRoleRef=/struts_pro/WebAppSecurityRoleRef.html WebAppSecurityRoleRef_Properties=/struts_pro/WebAppSecurityRoleRef.html -WebAppSecurityRoleRef_Properties.WindowTitle=Edit Properties +WebAppSecurityRoleRef_Properties.WindowTitle=Properties WebAppSecurityRoleRef_Properties.Title=Web Security Role Ref ##### web servlet element ##### @@ -409,7 +409,7 @@ WebAppServlet=/struts_pro/WebAppServlet.html WebAppServlet_Properties=/struts_pro/WebAppServlet.html -WebAppServlet_Properties.WindowTitle=Edit Properties +WebAppServlet_Properties.WindowTitle=Properties WebAppServlet_Properties.Title=Web Servlet WebAppServlet_CreateInitParam=/struts_pro/WebAppServlet_CreateInitParam.html @@ -425,7 +425,7 @@ WebAppServletMapping=/struts_pro/WebAppServletMapping.html WebAppServletMapping_Properties=/struts_pro/WebAppServletMapping.html -WebAppServletMapping_Properties.WindowTitle=Edit Properties +WebAppServletMapping_Properties.WindowTitle=Properties WebAppServletMapping_Properties.Title=Web Servlet Mapping ##### web session-config element ##### @@ -433,7 +433,7 @@ WebAppSessionConfig=/struts_pro/WebAppSessionConfig.html WebAppSessionConfig_Properties=/struts_pro/WebAppSessionConfig.html -WebAppSessionConfig_Properties.WindowTitle=Edit Properties +WebAppSessionConfig_Properties.WindowTitle=Properties WebAppSessionConfig_Properties.Title=Web Session Config ##### web taglib element ##### @@ -441,7 +441,7 @@ WebAppTaglib=/struts_pro/WebAppTaglib.html WebAppTaglib_Properties=/struts_pro/WebAppTaglib.html -WebAppTaglib_Properties.WindowTitle=Edit Properties +WebAppTaglib_Properties.WindowTitle=Properties WebAppTaglib_Properties.Title=Web taglib ##### web user-constraint element ##### @@ -449,7 +449,7 @@ WebAppUserConstraint=/struts_pro/WebAppUserConstraint.html WebAppUserConstraint_Properties=/struts_pro/WebAppUserConstraint.html -WebAppUserConstraint_Properties.WindowTitle=Edit Properties +WebAppUserConstraint_Properties.WindowTitle=Properties WebAppUserConstraint_Properties.Title=Web User Constraint ##### web welcome-file element ##### @@ -457,7 +457,7 @@ WebAppWelcomFile=/struts_pro/WebAppWelcomFile.html WebAppWelcomFile_Properties=/struts_pro/WebAppWelcomFile.html -WebAppWelcomFile_Properties.WindowTitle=Edit Properties +WebAppWelcomFile_Properties.WindowTitle=Properties WebAppWelcomFile_Properties.Title=Web Welcome File ##### web welcome-file-list element ##### @@ -465,7 +465,7 @@ WebAppWelcomFileList=/struts_pro/WebAppWelcomFileList.html WebAppWelcomFileList_Properties=/model/noHelpYet.html -WebAppWelcomFileList_Properties.WindowTitle=Edit Properties +WebAppWelcomFileList_Properties.WindowTitle=Properties WebAppWelcomFileList_Properties.Title=Web Welcom File List WebAppWelcomFileList_CreateWelcomFile=/struts_pro/WebAppWelcomFileList_CreateWelcomFile.html @@ -477,7 +477,7 @@ WebAppRoleName=/struts_pro/WebAppRoleName.html WebAppRoleName_Properties=/struts_pro/WebAppRoleName.html -WebAppRoleName_Properties.WindowTitle=Edit Properties +WebAppRoleName_Properties.WindowTitle=Properties WebAppRoleName_Properties.Title=Web Role ##### Create File web.xml ##### @@ -500,7 +500,7 @@ FileValidationRules=/struts_pro/FileValidationRules.html FileValidationRules_Properties=/struts_pro/FileValidationRules.html -FileValidationRules_Properties.WindowTitle=Edit Properties +FileValidationRules_Properties.WindowTitle=Properties FileValidationRules_Properties.Title=Validation Framework FileValidationRules_AddFormset_0=/struts_pro/FileValidationRules_AddFormset_0.html @@ -517,7 +517,7 @@ PropertyFileSelector=/model/noHelpYet.html PropertyFileSelector_Properties=/model/noHelpYet.html -PropertyFileSelector_Properties.WindowTitle=Edit Properties +PropertyFileSelector_Properties.WindowTitle=Properties PropertyFileSelector_Properties.Title=Property File PropertyFileSelector_Edit=/model/noHelpYet.html @@ -575,7 +575,7 @@ ValidationConstant_Edit.Title=Validation Constant ValidationConstant_Properties=/struts_pro/ValidationConstant.html -ValidationConstant_Properties.WindowTitle=Edit Properties +ValidationConstant_Properties.WindowTitle=Properties ValidationConstant_Properties.Title=Validation Properties ##### Validation field element ##### @@ -583,7 +583,7 @@ ValidationField=/struts_pro/ValidationField.html ValidationField_Properties=/struts_pro/ValidationField.html -ValidationField_Properties.WindowTitle=Edit Properties +ValidationField_Properties.WindowTitle=Properties ValidationField_Properties.Title=Validation Field ValidationField_AddMsg=/struts_pro/ValidationField_AddMsg.html @@ -611,7 +611,7 @@ ValidationForm=/struts_pro/ValidationForm.html ValidationForm_Properties=/struts_pro/ValidationForm.html -ValidationForm_Properties.WindowTitle=Edit Properties +ValidationForm_Properties.WindowTitle=Properties ValidationForm_Properties.Title=Validation Form ValidationForm_AddField=/struts_pro/ValidationForm_AddField.html @@ -623,7 +623,7 @@ ValidationFormset=/struts_pro/ValidationFormset.html ValidationFormset_Properties=/struts_pro/ValidationFormset.html -ValidationFormset_Properties.WindowTitle=Edit Properties +ValidationFormset_Properties.WindowTitle=Properties ValidationFormset_Properties.Title=Validation Formset ValidationFormset_AddConstant=/struts_pro/ValidationFormset_AddConstant.html @@ -639,7 +639,7 @@ ValidationGlobal=/struts_pro/ValidationGlobal.html ValidationGlobal_Properties=/struts_pro/ValidationGlobal.html -ValidationGlobal_Properties.WindowTitle=Edit Properties +ValidationGlobal_Properties.WindowTitle=Properties ValidationGlobal_Properties.Title=Validation Global ValidationGlobal_AddValidator=/struts_pro/ValidationGlobal_AddValidator.html @@ -659,7 +659,7 @@ ValidationMsg_Edit.Title=Validation Msg ValidationMsg_Properties=/struts_pro/ValidationMsg.html -ValidationMsg_Properties.WindowTitle=Edit Properties +ValidationMsg_Properties.WindowTitle=Properties ValidationMsg_Properties.Title=Validation Msg ##### Validation validator element ##### @@ -675,7 +675,7 @@ ValidationValidator_EditBody.Title=Validator ValidationValidator_Properties=/struts_pro/ValidationValidator.html -ValidationValidator_Properties.WindowTitle=Edit Properties +ValidationValidator_Properties.WindowTitle=Properties ValidationValidator_Properties.Title=Validator ##### Validation var element ##### Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/CreateStrutsProjectHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/CreateStrutsProjectHandler.java 2008-03-24 14:53:28 UTC (rev 7073) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/CreateStrutsProjectHandler.java 2008-03-24 14:53:47 UTC (rev 7074) @@ -12,6 +12,7 @@ import java.util.*; 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 CreateStrutsProjectHandler extends AbstractHandler { @@ -20,7 +21,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { CreateProjectAction action = new CreateProjectAction(); action.run(); } Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportStrutsProjectHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportStrutsProjectHandler.java 2008-03-24 14:53:28 UTC (rev 7073) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportStrutsProjectHandler.java 2008-03-24 14:53:47 UTC (rev 7074) @@ -12,6 +12,7 @@ import java.util.*; 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 ImportStrutsProjectHandler extends AbstractHandler { @@ -20,7 +21,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { ImportProjectAction action = new ImportProjectAction(); action.run(); } Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/CreateEclipseProjectHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/CreateEclipseProjectHandler.java 2008-03-24 14:53:28 UTC (rev 7073) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/CreateEclipseProjectHandler.java 2008-03-24 14:53:47 UTC (rev 7074) @@ -12,6 +12,7 @@ import java.util.*; 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.struts.ui.internal.action.CreateProjectAction; @@ -21,7 +22,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { CreateProjectAction action = new CreateProjectAction(); action.run(); } Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/ImportEclipseProjectHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/ImportEclipseProjectHandler.java 2008-03-24 14:53:28 UTC (rev 7073) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/model/handlers/project/ImportEclipseProjectHandler.java 2008-03-24 14:53:47 UTC (rev 7074) @@ -12,6 +12,7 @@ import java.util.*; 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.struts.ui.internal.action.ImportProjectAction; @@ -21,7 +22,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { ImportProjectAction action = new ImportProjectAction(); action.run();

18 years

1
0
0 / 0

JBoss Tools SVN: r7073 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:53:28 -0400 (Mon, 24 Mar 2008) New Revision: 7073 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java Log: JBIDE-893 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-03-24 14:53:19 UTC (rev 7072) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-03-24 14:53:28 UTC (rev 7073) @@ -3,6 +3,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.FindObjectHelper; @@ -38,7 +39,7 @@ } @Override - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { execute(); setFinished(true); @@ -55,7 +56,7 @@ } } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p0 = extractStepData(0); XModelObject provider = getTarget().getModel().createModelObject(providerEntity, p0);

18 years

1
0
0 / 0

JBoss Tools SVN: r7072 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/action and 13 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:53:19 -0400 (Mon, 24 Mar 2008) New Revision: 7072 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java Log: JBIDE-893 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -12,6 +12,7 @@ import java.util.StringTokenizer; import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.*; @@ -72,7 +73,7 @@ } try { workbenchPage.openEditor(input, id); - } catch (Exception e) { + } catch (PartInitException e) { ModelUIPlugin.getPluginLog().logError((Exception)e); } } @@ -91,7 +92,7 @@ IResource[] rs = null; try { rs = projects[i].members(true); - } catch (Exception e) { + } catch (CoreException e) { //ignore } if(rs != null) for (int j = 0; j < rs.length; j++) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.meta.action.SignificanceMessageFactory; import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.meta.action.XActionItem; @@ -45,8 +46,8 @@ public Shell getShell() { if(shell != null) return shell; try { - return ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - } catch (Exception t) { + return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + } catch (NullPointerException t) { return null; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -13,13 +13,13 @@ import java.util.*; import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.*; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.adapter.IModelObjectAdapter; import org.jboss.tools.common.model.event.*; -import org.jboss.tools.common.model.ui.ModelUIPlugin; public class XModelObjectPropertySource implements IPropertySource, IXModelSupport, IModelObjectAdapter, IPropertySource2 { protected ArrayList<IPropertyDescriptor> propertyDescriptors; @@ -114,17 +114,14 @@ if(modelObject == null || modelObject != event.getModelObject()) return; PropertySheet sh = null; try { - sh = (PropertySheet)ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.ui.views.PropertySheet"); - } catch (Exception exc) { + sh = (PropertySheet)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.ui.views.PropertySheet"); + } catch (NullPointerException exc) { //ignore } if(sh == null) return; - try { - PropertySheetPage p = (PropertySheetPage)sh.getCurrentPage(); - if(p != null) p.refresh(); - } catch (Exception e) { - //ignore - } + PropertySheetPage p = (PropertySheetPage)sh.getCurrentPage(); + if(p == null || p.getControl() == null || p.getControl().isDisposed()) return; + p.refresh(); } public void structureChanged(XModelTreeEvent event) {} } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -57,7 +57,7 @@ } IResource r = EclipseResourceUtil.getJavaSourceRoot(project); if(r == null || !r.exists()) r = project; - return packageFragmentRoot = javaProject.getPackageFragmentRoot(r); + return packageFragmentRoot = javaProject == null ? null : javaProject.getPackageFragmentRoot(r); } public void init(IProject project, String publicId, String xPath, String name) { @@ -86,10 +86,10 @@ return; } - packageFragmentRoot = javaProject.getPackageFragmentRoot(javaProject.getResource()); + packageFragmentRoot = javaProject == null ? null : javaProject.getPackageFragmentRoot(javaProject.getResource()); try { - javaElement = javaProject.findElement(new Path(fullClassName)); + javaElement = javaProject == null ? null : javaProject.findElement(new Path(fullClassName)); } catch (JavaModelException e) { javaElement = null; // no validation here Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -42,6 +42,7 @@ public TreeSelectionFieldEditor(IWidgetSettings settings) { super(settings); + } ///public TreeSelectionFieldEditor(String name, String labelText, Composite parent, IWidgetSettings settings) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -58,7 +58,7 @@ sb.append(new String(b, 0, l)); } is.close(); - } catch (Exception e) { + } catch (IOException e) { CommonPlugin.getPluginLog().logError(e); } return sb.toString(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; +import org.eclipse.swt.SWTException; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.graphics.Color; @@ -196,13 +197,13 @@ item = table.getItem(i); try { item.dispose(); - } catch (Exception e) { + } catch (SWTException e) { ModelUIPlugin.getPluginLog().logError(e); } } if(r >= 0) try { table.setSelection(r); - } catch (Exception e) { + } catch (SWTException e) { //ignore } resizeLock = false; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -19,7 +19,6 @@ import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.views.contentoutline.*; -import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.dnd.ControlDragDrop; import org.jboss.tools.common.model.ui.navigator.*; import org.jboss.tools.common.model.ui.select.XModelObjectSelectionProvider; @@ -53,11 +52,7 @@ if (selectionProvider!=null) selectionProvider.dispose(); selectionProvider = null; if(getSite() == null) return; - try { - getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener()); - } catch (Exception e) { - ModelUIPlugin.getPluginLog().logError(e); - } + getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener()); } public void setCache(XModelObjectCache cache) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -38,9 +38,9 @@ public void cache() { problemsCache = new HashMap<Problem,IMarker>(); IMarker[] ms = new IMarker[0]; - try { + if(resource != null) try { ms = resource.findMarkers(null, true, IResource.DEPTH_INFINITE); - } catch (Exception e) { + } catch (CoreException e) { ModelUIPlugin.getPluginLog().logError(e); } for (int i = 0; i < ms.length; i++) { @@ -63,7 +63,7 @@ try { m.setAttribute(IMarker.CHAR_START, pos_i); m.setAttribute(IMarker.CHAR_END, pos_i + 1); - } catch (Exception e) { + } catch (CoreException e) { ModelUIPlugin.getPluginLog().logError(e); } } @@ -75,7 +75,7 @@ for (int i = 0; i < ms.length; i++) { try { ms[i].delete(); - } catch (Exception e) { + } catch (CoreException e) { ModelUIPlugin.getPluginLog().logError(e); } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -52,11 +52,7 @@ public void setHost(ISelectionProvider host) { if(this.host == host) return; if(this.host != null) { - try { - this.host.removeSelectionChangedListener(this); - } catch (Exception e) { - ModelUIPlugin.getPluginLog().logError(e); - } + this.host.removeSelectionChangedListener(this); } this.host = host; if(host != null) @@ -71,6 +67,8 @@ try { return (host == null) ? null : convertSelectionToAdapter(host.getSelection()); } catch (Exception e) { + //TODO study possible problems and narrow caught exceptions. + ModelUIPlugin.getPluginLog().logError(e); return null; } } @@ -92,9 +90,9 @@ try { if (!listeners.isEmpty()) { SelectionChangedEvent newEvent = new SelectionChangedEvent(this, convertSelectionToAdapter(event.getSelection())); - Iterator iterator = listeners.iterator(); + Iterator<ISelectionChangedListener> iterator = listeners.iterator(); while (iterator.hasNext()) - ((ISelectionChangedListener)iterator.next()).selectionChanged(newEvent); + iterator.next().selectionChanged(newEvent); } } finally { isFiringSelection = false; @@ -106,9 +104,9 @@ isFiringSelection = true; try { if (!listeners.isEmpty()) { - Iterator iterator = listeners.iterator(); + Iterator<ISelectionChangedListener> iterator = listeners.iterator(); while (iterator.hasNext()) - ((ISelectionChangedListener)iterator.next()).selectionChanged(event); + iterator.next().selectionChanged(event); } } finally { isFiringSelection = false; @@ -116,10 +114,13 @@ } private ISelection convertSelectionToAdapter(ISelection selection) { + if(!(selection instanceof IStructuredSelection) || selection.isEmpty()) { + return selection; + } IStructuredSelection structuredSelection = (IStructuredSelection)selection; - List objects = structuredSelection.toList(); + List<?> objects = structuredSelection.toList(); List<Object> adaptedObjects = new ArrayList<Object>(); - Iterator iterator = objects.iterator(); + Iterator<?> iterator = objects.iterator(); while (iterator.hasNext()) { Object object = iterator.next(); if (object instanceof XModelObject) { @@ -138,10 +139,13 @@ } private ISelection convertSelectionFromAdapter(ISelection selection) { + if(!(selection instanceof IStructuredSelection) || selection.isEmpty()) { + return selection; + } IStructuredSelection structuredSelection = (IStructuredSelection)selection; - List objects = structuredSelection.toList(); + List<?> objects = structuredSelection.toList(); List<XModelObject> modelObjects = new ArrayList<XModelObject>(); - Iterator iterator = objects.iterator(); + Iterator<?> iterator = objects.iterator(); while (iterator.hasNext()) { Object object = iterator.next(); if (object instanceof XModelObject) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -53,7 +53,7 @@ if(current != null) setAttributeValue(0, property, current); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { getProperties().setProperty(property, getAttributeValue(0, property)); setFinished(true); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -13,6 +13,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Properties; import java.util.ResourceBundle; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; @@ -23,14 +24,14 @@ import org.jboss.tools.common.editor.ObjectTextEditor; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.SWTException; import org.eclipse.swt.events.FocusListener; -//import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -46,9 +47,6 @@ import org.eclipse.ui.texteditor.RevertToSavedAction; import org.eclipse.ui.texteditor.SaveAction; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; -import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML; - import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; @@ -108,11 +106,7 @@ if(sv == null) return ""; IDocument d = sv.getDocument(); if(d == null) return ""; - try { - text = d.get(); - } catch (Exception ex) { - ModelUIPlugin.getPluginLog().logError(ex); - } + text = d.get(); return (text == null) ? "" : text; } @@ -167,14 +161,19 @@ public void setCursor(int line, int position) { ISourceViewer sv = getSourceViewer(); - if(sv == null) return; + if(sv == null || sv.getDocument() == null) return; try { int i = sv.getDocument().getLineOffset(line - 1) + position -1; sv.setSelectedRange(i, 0); sv.revealRange(i, 0); - } catch (Exception e) { + } catch (BadLocationException e) { ModelUIPlugin.getPluginLog().logError(e); + } catch (SWTException e) { + ModelUIPlugin.getPluginLog().logError(e); + } catch (IllegalArgumentException e) { + ModelUIPlugin.getPluginLog().logError(e); } + } public void doSaveAs() { @@ -329,15 +328,11 @@ } public void dispose() { - try { super.dispose(); if(changeListener != null) { ModelPlugin.getWorkspace().removeResourceChangeListener(changeListener); changeListener = null; } - } catch (Exception t) { - ModelUIPlugin.getPluginLog().logError("Error in disposing xml editor", t); - } } public void selectModelObject(XModelObject object, String attribute) { @@ -347,11 +342,7 @@ int bp = searcher.getStartPosition(); int ep = searcher.getEndPosition(); if(ep >= bp && bp >= 0) { - try { - selectAndReveal(bp, ep - bp); - } catch (Exception e) { - ModelUIPlugin.getPluginLog().logError(e); - } + selectAndReveal(bp, ep - bp); } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -636,6 +636,8 @@ c = t.getOffsetAtLocation(new Point(x, y)); if (c < 0) c = 0; } catch (IllegalArgumentException ex) { + //do not log, catching that exception is + //the way to know that we are out of line. if (lineIndex + 1 >= t.getLineCount()) { return t.getCharCount(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -93,7 +93,7 @@ class SWS extends SpecialWizardSupport { public SWS() {} - public void action(String name) throws Exception {} + public void action(String name) throws XModelException {} } public String validate(Properties data) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -14,6 +14,7 @@ import org.jboss.tools.common.model.ui.wizards.special.DefaultSpecialWizard; import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class OneStepWizard implements SpecialWizard { @@ -46,7 +47,7 @@ return new String[]{FINISH, CANCEL, HELP}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(CANCEL.equals(name)) { setFinished(true); } else if(FINISH.equals(name)) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java 2008-03-24 14:52:43 UTC (rev 7071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java 2008-03-24 14:53:19 UTC (rev 7072) @@ -15,13 +15,14 @@ import org.jboss.tools.common.model.ui.wizards.special.DefaultSpecialWizard; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.meta.action.XEntityData; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.ui.ModelUIPlugin; public class ServiceDialogImpl implements ServiceDialog { protected String title; @@ -45,11 +46,10 @@ public static Shell getShell() { try { - return ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - } catch (Exception t) { + return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + } catch (NullPointerException t) { return null; - } - + } } public int showDialog(String title, String message, @@ -86,7 +86,7 @@ return options; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { for(int i = 0; i < options.length; i++) { if(name.equals(options[i])) { returnCode = i;

18 years

1
0
0 / 0

JBoss Tools SVN: r7071 - trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:52:43 -0400 (Mon, 24 Mar 2008) New Revision: 7071 Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java Log: JBIDE-893 Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java 2008-03-24 14:52:36 UTC (rev 7070) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java 2008-03-24 14:52:43 UTC (rev 7071) @@ -23,7 +23,7 @@ return object != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { defpath = action.getProperty("default"); XModelObject q = findOrCreateProperties(object); XModelObject[] fs = object.getChildren("FileMETA");

18 years

1
0
0 / 0

JBoss Tools SVN: r7070 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 10:52:36 -0400 (Mon, 24 Mar 2008) New Revision: 7070 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java Log: JBIDE-893 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2008-03-24 12:09:28 UTC (rev 7069) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2008-03-24 14:52:36 UTC (rev 7070) @@ -14,19 +14,20 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.undo.XTransactionUndo; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; public class DeleteUniqueHandler extends DefaultRemoveHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String transactionName = "delete " + DefaultCreateHandler.title(object, false); executeInTransaction(object, p, transactionName, XTransactionUndo.REMOVE); } - protected void transaction(XModelObject object, Properties p) throws Exception { + protected void transaction(XModelObject object, Properties p) throws XModelException { XModelObject parent = object.getParent(); removeFromParent(object); String entity = action.getProperty("entity"); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2008-03-24 12:09:28 UTC (rev 7069) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2008-03-24 14:52:36 UTC (rev 7070) @@ -16,12 +16,13 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; import org.jboss.tools.common.meta.action.impl.handlers.PasteHandler; import org.jboss.tools.common.model.XModelBuffer; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ServiceDialog; public class PasteUniqueHandler extends PasteHandler { - 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 = parent.getModel().getModelBuffer(); boolean isParent = isParent(parent, buffer.copy(sourceIndex)); if(isParent) {

18 years

1
0
0 / 0

JBoss Tools SVN: r7069 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-03-24 08:09:28 -0400 (Mon, 24 Mar 2008) New Revision: 7069 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java Log: JBIDE-893 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java 2008-03-24 12:09:28 UTC (rev 7069) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.model; + +/** + * @author Viacheslav Kabanovich + */ +public class XModelException extends Exception { + private static final long serialVersionUID = 1L; + + public XModelException() {} + + public XModelException(String message) { + super(message); + } + + public XModelException(String message, Throwable cause) { + super(message, cause); + } + + public XModelException(Throwable cause) { + super(cause); + } + +}

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2008