JBoss Tools SVN: r7088 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: attribute/editor and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 12:20:28 -0400 (Mon, 24 Mar 2008)
New Revision: 7088
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -65,7 +65,7 @@
if(newValueClassName != null) {
try {
newValueProvider = (INewValueProvider)ModelFeatureFactory.getInstance().createFeatureInstance(newValueClassName);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -409,7 +409,7 @@
return getChildCount() == 0;
}
- public Iterator children() {
+ public Iterator<JavaElement> children() {
return children.iterator();
}
@@ -532,7 +532,7 @@
AccessibleJava.IContextPackageProvider o = (AccessibleJava.IContextPackageProvider)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
return null;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -259,7 +259,7 @@
AccessibleJava.IContextPackageProvider o = (AccessibleJava.IContextPackageProvider)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
return null;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -15,13 +15,10 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dnd.IDragAndDropService;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.navigator.TreeViewerDragDropProvider;
import org.jboss.tools.common.meta.XAdoptManager;
import org.jboss.tools.common.model.event.*;
-import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
@@ -33,7 +30,7 @@
static {
try {
paletteAdopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -239,7 +236,7 @@
private TreeItem getPrevTreeItem (Tree tree, TreeItem item) {
TreeItem result = null;
- Vector rows = getTreeExpandedItems(tree);
+ Vector<TreeItem> rows = getTreeExpandedItems(tree);
int index = rows.indexOf(item);
if (index > 0) {
result = (TreeItem)rows.get(index - 1);
@@ -368,9 +365,9 @@
public Widget findTreeItem (int x, int y) {
try {
Tree tree = (provider.getControl() instanceof Tree) ? (Tree)provider.getControl() : null;
- Vector items = getTreeExpandedItems(tree);
+ Vector<TreeItem> items = getTreeExpandedItems(tree);
for (int i = 0; i < items.size(); i++) {
- TreeItem item = (TreeItem)items.get(i);
+ TreeItem item = items.get(i);
Rectangle bounds = item.getBounds();
Point p = tree.toDisplay(bounds.x, bounds.y);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -39,7 +39,7 @@
} else {
try {
form = (IForm)ModelFeatureFactory.getInstance().createFeatureInstance(forms[i].getFormClassName());
- } catch(Exception e) {
+ } catch(ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -86,7 +86,7 @@
XFilteredTree result = null;
try {
result = (XFilteredTree)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
return null;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -26,7 +26,7 @@
CreateFileSupport support = null;
try {
support = (CreateFileSupport)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.model.handlers.CreateJSPFileSupport");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
if(support == null) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -145,12 +145,11 @@
ISpecialWizardStep step = null;
try {
step = (ISpecialWizardStep)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
- //Class.forName(cls, true, getClass().getClassLoader()).newInstance();
if(step instanceof AbstractSpecialWizardStep) {
((AbstractSpecialWizardStep)step).setWizard(this);
}
step.setSupport(support, i);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError("Cannot load class '" + cls + "'.");
}
return step;
18 years
- 1
- 0
JBoss Tools SVN: r7087 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-24 12:03:00 -0400 (Mon, 24 Mar 2008)
New Revision: 7087
Modified:
trunk/seam/docs/reference/en/modules/directory_structure.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-135 relative link's been added
Modified: trunk/seam/docs/reference/en/modules/directory_structure.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/directory_structure.xml 2008-03-24 15:58:02 UTC (rev 7086)
+++ trunk/seam/docs/reference/en/modules/directory_structure.xml 2008-03-24 16:03:00 UTC (rev 7087)
@@ -6,59 +6,73 @@
<keyword>JBoss Tools</keyword>
<keyword>Seam</keyword>
<keyword>Eclipse</keyword>
- </keywordset>
+ </keywordset>
</chapterinfo>
-
+
<title>Directory Structure of the Generated Project</title>
-
- <para>In this chapter we describe where the Seam wizard puts the generated files for both EAR and WAR deployments.</para>
- <para>The Seam Project wizard generates projects like Eclipse WTP style in order to utilize Eclipse WTP features and to have a correct classpath. To be more precise it generates
- one project per artifact.</para>
-
- <section id="WAR">
+
+ <para>In this chapter we describe where the Seam wizard puts the generated files for both EAR
+ and WAR deployments.</para>
+ <para>The Seam Project wizard generates projects like Eclipse WTP style in order to utilize
+ Eclipse WTP features and to have a correct classpath. To be more precise it generates one
+ project per artifact.</para>
+
+ <section id="WAR">
<title>WAR Deployment</title>
-
- <para>The project layout for WAR projects is:</para>
-
- <figure>
- <title>Project Layout for WAR projects</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/directory_structure/directory_structure_1.png" />
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>A WAR project can only use Seam JavaBean and JPA Entity bean components; it cannot use EJB3 Session beans etc.</para>
- <para>WAR projects are generated to enable Seam 1.2.1 war hotdeploy feature. Classes put into <emphasis><property>src/action</property></emphasis> will be
- deployed to <emphasis><property>WEB-INF/dev</property></emphasis> from which Seam 1.2.1 automatically will perform hotdeploy of new components.</para>
- <note>
- <title>Note:</title>
- <para>Because of Eclipse WTP limits the hot deployed classes also existed in <emphasis><property>WEB-INF/classes</property></emphasis>,
- but since Seam gives <emphasis><property>WEB-INF/dev</property></emphasis> precedence it will work.</para>
- </note>
-
- <para>Furthermore the Seam Project wizard generates a test project that is setup to run TestNG directly against the proper libraries and server runtime libraries.
- When the TestNG plugin is installed you can just run your tests via <emphasis><property>Run As > TestNG Test</property>.</emphasis></para>
-
+
+ <para>The project layout for WAR projects is:</para>
+
+ <figure>
+ <title>Project Layout for WAR projects</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/directory_structure/directory_structure_1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>A WAR project can only use Seam JavaBean and JPA Entity bean components; it cannot use
+ EJB3 Session beans etc.</para>
+ <para>WAR projects are generated to enable Seam 1.2.1 war hotdeploy feature. Classes put
+ into <emphasis>
+ <property>src/action</property>
+ </emphasis> will be deployed to <emphasis>
+ <property>WEB-INF/dev</property>
+ </emphasis> from which Seam 1.2.1 automatically will perform hotdeploy of new
+ components.</para>
+ <note>
+ <title>Note:</title>
+ <para>Because of Eclipse WTP limits the hot deployed classes also existed in <emphasis>
+ <property>WEB-INF/classes</property>
+ </emphasis>, but since Seam gives <emphasis>
+ <property>WEB-INF/dev</property>
+ </emphasis> precedence it will work.</para>
+ </note>
+
+ <para>Furthermore the Seam Project wizard generates a test project that is setup to run
+ <link linkend="testNG">TestNG</link> directly against the proper libraries and
+ server runtime libraries. When the TestNG plugin is installed you can just run your
+ tests via <emphasis><property>Run As > TestNG Test</property>.</emphasis></para>
+
</section>
-
- <section id="EAR">
+
+ <section id="EAR">
<title>EAR Deployment</title>
- <para>The project layout for EAR projects is:</para>
-
- <figure>
- <title>Project Layout for WAR projects</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/directory_structure/directory_structure_2.png" />
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>An EAR project can use the whole range of Seam components, including EJB3 Session beans.</para>
-
+ <para>The project layout for EAR projects is:</para>
+
+ <figure>
+ <title>Project Layout for WAR projects</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/directory_structure/directory_structure_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>An EAR project can use the whole range of Seam components, including EJB3 Session
+ beans.</para>
+
</section>
-
-
- </chapter>
+
+
+</chapter>
18 years
- 1
- 0
JBoss Tools SVN: r7086 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-03-24 11:58:02 -0400 (Mon, 24 Mar 2008)
New Revision: 7086
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1941
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-24 15:44:54 UTC (rev 7085)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-24 15:58:02 UTC (rev 7086)
@@ -1298,9 +1298,7 @@
for (long i = len - 1; i >= 0; i--) {
nsIDOMNode node = children.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
- String name = node.getNodeName();
- if (HTML.TAG_LINK.equalsIgnoreCase(name)
- || isLinkReplacer(node)) {
+ if (isLinkReplacer(node)) {
/*Added by Max Areshkau(Fix for JBIDE-1941)
* Ext. attribute used for adding external styles
* to editor. If was added external attribute, this
18 years
- 1
- 0
JBoss Tools SVN: r7085 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-03-24 11:44:54 -0400 (Mon, 24 Mar 2008)
New Revision: 7085
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1941
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-24 15:24:49 UTC (rev 7084)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-24 15:44:54 UTC (rev 7085)
@@ -1301,7 +1301,12 @@
String name = node.getNodeName();
if (HTML.TAG_LINK.equalsIgnoreCase(name)
|| isLinkReplacer(node)) {
- if (NO_STRING.equalsIgnoreCase(((nsIDOMElement) node
+ /*Added by Max Areshkau(Fix for JBIDE-1941)
+ * Ext. attribute used for adding external styles
+ * to editor. If was added external attribute, this
+ * property is true.
+ */
+ if (!YES_STRING.equalsIgnoreCase(((nsIDOMElement) node
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID))
.getAttribute("ext"))) {
// int linkAddress =
18 years
- 1
- 0
JBoss Tools SVN: r7084 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:24:49 -0400 (Mon, 24 Mar 2008)
New Revision: 7084
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
Log:
JBIDE-1750
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2008-03-24 15:23:12 UTC (rev 7083)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2008-03-24 15:24:49 UTC (rev 7084)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.internal.core.SeamResourceVisitor;
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
@@ -96,6 +97,8 @@
new SeamRuntimeValidation().validate(sp);
+ TypeInfoCollector.cleanCache();
+
if (kind == FULL_BUILD) {
fullBuild(monitor);
} else {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2008-03-24 15:23:12 UTC (rev 7083)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2008-03-24 15:24:49 UTC (rev 7084)
@@ -47,8 +47,6 @@
* @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
*/
public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException {
- TypeInfoCollector.cleanCache();
-
SeamValidationHelper coreHelper = (SeamValidationHelper)helper;
ISeamProject project = coreHelper.getSeamProject();
if(project==null) {
18 years
- 1
- 0
JBoss Tools SVN: r7083 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:23:12 -0400 (Mon, 24 Mar 2008)
New Revision: 7083
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/CreateJSFProjectHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/ImportJSFProjectHandler.java
Log:
JBIDE-893
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/CreateJSFProjectHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/CreateJSFProjectHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/CreateJSFProjectHandler.java 2008-03-24 15:23:12 UTC (rev 7083)
@@ -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.jsf.ui.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/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/ImportJSFProjectHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/ImportJSFProjectHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/handler/ImportJSFProjectHandler.java 2008-03-24 15:23:12 UTC (rev 7083)
@@ -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.jsf.ui.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
JBoss Tools SVN: r7082 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: browser/wtp and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:21:06 -0400 (Mon, 24 Mar 2008)
New Revision: 7082
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -12,6 +12,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public abstract class AbstractBrowserContext implements IBrowserContext {
@@ -37,9 +38,9 @@
public void init() {
}
- public void execute(XModelObject object) throws Exception {
+ public void execute(XModelObject object) throws XModelException {
setLastRunObject(object);
- if(url == null) throw new Exception("Cannot open " + DefaultCreateHandler.title(object, false));
+ if(url == null) throw new XModelException("Cannot open " + DefaultCreateHandler.title(object, false));
doExecute(lastRunUrl);
if(lastRunUrl.equals(url)) {
history.add(lastRunObject, url);
@@ -48,7 +49,7 @@
}
}
- protected abstract void doExecute(String lastRunUrl) throws Exception;
+ protected abstract void doExecute(String lastRunUrl) throws XModelException;
boolean isLastRunObjectUpToDate(XModelObject o) {
if(o == null) return (lastRunObject == null);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -27,6 +27,7 @@
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.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -108,7 +109,7 @@
return null;
}
- protected void doExecute(String lastRunUrl) throws Exception {
+ protected void doExecute(String lastRunUrl) throws XModelException {
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
IServer server = ServerManager.getInstance().getSelectedServer();
if(server == null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
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.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.util.FileUtil;
@@ -100,15 +101,15 @@
}
}
- public void setWebXMLLocation(String location) throws Exception {
+ public void setWebXMLLocation(String location) throws XModelException {
location = location.replace('\\', '/');
if(location.equals(webxmlLocation)) return;
modules = new XModelObject[0];
File f = new File(location);
- if(!f.isFile()) throw new Exception("File " + location + " does not exist.");
+ if(!f.isFile()) throw new XModelException("File " + location + " does not exist.");
String body = FileUtil.readFile(f);
String entity = support.getTarget().getModel().getEntityRecognizer().getEntityName("xml", body);
- if(entity == null || !entity.startsWith("FileWebApp")) throw new Exception("File " + location + "is not recognized as web descriptor file.");
+ if(entity == null || !entity.startsWith("FileWebApp")) throw new XModelException("File " + location + "is not recognized as web descriptor file.");
XModelObject webxml = null;
try {
webxml = support.getTarget().getModel().createModelObject(entity, null);
@@ -117,10 +118,10 @@
XModelObjectLoaderUtil.getObjectLoader(webxml).load(webxml);
webxml.getChildren();
} catch (Exception e) {
- throw new Exception("Cannot load web descriptor file " + location + ".");
+ throw new XModelException("Cannot load web descriptor file " + location + ".");
}
if("yes".equals(webxml.getAttributeValue("isIncorrect")))
- throw new Exception("Web descriptor file " + location + "is corrupted.");
+ throw new XModelException("Web descriptor file " + location + "is corrupted.");
webxmlLocation = location;
modules = createModulesInfo(webxml, new File(webinfLocation));
}
@@ -216,16 +217,16 @@
return null;
}
- public void validateModules() throws Exception {
+ public void validateModules() throws XModelException {
for (int i = 0; i < modules.length; i++) {
String n = getModuleName(modules[i]);
String uri = modules[i].getAttributeValue("URI");
String path = modules[i].getAttributeValue("path on disk");
- if(path.length() == 0) throw new Exception("Path on disk for URI " + uri + " is not set.");
- if(!new File(path).isFile()) throw new Exception("Path on disk " + path + "\nfor URI " + uri + " does not exist.");
+ if(path.length() == 0) throw new XModelException("Path on disk for URI " + uri + " is not set.");
+ if(!new File(path).isFile()) throw new XModelException("Path on disk " + path + "\nfor URI " + uri + " does not exist.");
path = modules[i].getAttributeValue("root");
- if(path.length() == 0) throw new Exception("Root for " + n + " is not set.");
- if(!new File(path).isDirectory()) throw new Exception("Root " + path + "\nfor " + n + " does not exist.");
+ if(path.length() == 0) throw new XModelException("Root for " + n + " is not set.");
+ if(!new File(path).isDirectory()) throw new XModelException("Root " + path + "\nfor " + n + " does not exist.");
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -20,6 +20,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.engines.impl.EnginesLoader;
import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl;
@@ -231,10 +232,10 @@
}
}
- protected void loadWebXML(String body, String location) throws Exception {
+ protected void loadWebXML(String body, String location) throws XModelException {
String entity = getTarget().getModel().getEntityRecognizer().getEntityName("xml", body); //$NON-NLS-1$
if(entity == null || !entity.startsWith("FileWebApp")) { //$NON-NLS-1$
- throw new Exception(NLS.bind(WebUIMessages.FILE_ISNOT_RECOGNIZED, location));
+ throw new XModelException(NLS.bind(WebUIMessages.FILE_ISNOT_RECOGNIZED, location));
}
try {
webxml = getTarget().getModel().createModelObject(entity, null);
@@ -244,13 +245,13 @@
webxml.getChildren();
} catch (Exception e) {
String webXMLErrorMessage = NLS.bind(WebUIMessages.CANNOT_LOAD_WEBDESCRIPTOR,location);
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
if("yes".equals(webxml.getAttributeValue("isIncorrect"))) { //$NON-NLS-1$ //$NON-NLS-2$
String[] errors = ((AbstractXMLFileImpl)webxml).getErrors();
String error = (errors == null || errors.length == 0) ? "" : ": " + errors[0]; //$NON-NLS-1$ //$NON-NLS-2$
String webXMLErrorMessage = NLS.bind(WebUIMessages.WEBDESCRIPTOR_FILE_IS_CORRUPTED, error);
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,7 +13,6 @@
import java.util.*;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.impl.XModelImpl;
-import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -29,7 +28,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;
ServiceDialog d = object.getModel().getService();
String mes = WebUIMessages.YOU_WANT_TO_REARRANGE_THE_DIAGRAM_ELEMENTS;
@@ -52,7 +51,7 @@
}
}
- protected Items getItemsInstance() throws Exception {
+ protected Items getItemsInstance() {
String clsname = action.getProperty("items-class"); //$NON-NLS-1$
return (Items)ModelFeatureFactory.getInstance().createFeatureInstance(clsname);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -15,6 +15,7 @@
import java.util.*;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
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.files.handlers.*;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
@@ -49,9 +50,13 @@
return new String[]{BACK, FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(NEXT.equals(name)) {
- initSelectedTaglibs();
+ try {
+ initSelectedTaglibs();
+ } catch (IOException e) {
+ throw new XModelException(e);
+ }
setStepId(1);
} else if(BACK.equals(name)) {
saveSelectedTaglibs();
@@ -177,9 +182,9 @@
return;
}
String body = getTemplateBody();
- Set existing = taglibs.getTaglibsFromTemplate(body);
+ Set<String> existing = taglibs.getTaglibsFromTemplate(body);
StringBuffer sb = new StringBuffer();
- Iterator it = existing.iterator();
+ Iterator<String> it = existing.iterator();
while(it.hasNext()) {
String s = it.next().toString();
if(sb.length() > 0) sb.append(";");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,7 +19,7 @@
public class DeleteTLDHandler extends DeleteFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
boolean unregister = false;
if(getHelper(object).isRegistered(object.getModel(), object)) {
String checkboxMessage = WebUIMessages.DELETE_REFERENCE_FROM_WEBDESCRIPTOR;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -25,7 +25,7 @@
return (object != null && object.isActive());
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = new Properties();
p.put("object", object);
String help = action.getProperty("help");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -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 {
if(!isEnabled(object)) return;
XModelObject[] os = getReferringObjects(object);
if(os.length == 0) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -12,6 +12,7 @@
import java.util.Properties;
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.FindObjectHelper;
import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper;
@@ -27,7 +28,7 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = new Properties();
p.put("object", object);
p.put("help", "JSFProcess_SelectItem");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -38,7 +38,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/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -44,7 +44,7 @@
}
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
context.execute(object);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -29,7 +29,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;
String attr = object.getAttributeValue("hide comments");
attr = ("no".equals(attr)) ? "yes" : "no";
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,6 +19,7 @@
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.meta.action.impl.XActionImpl;
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.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -48,7 +49,7 @@
return false;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String name = object.getAttributeValue("application name"); //$NON-NLS-1$
if(p != null && "true".equals(p.getProperty("unregisterFromAllServers"))) {
unregisterFromAllServers(object);
@@ -68,7 +69,7 @@
return RegistrationHelper.isRegistered(EclipseResourceUtil.getProject(object));
}
- void unregisterFromAllServers(XModelObject object) throws Exception {
+ void unregisterFromAllServers(XModelObject object) throws XModelException {
IProject project = EclipseResourceUtil.getProject(object);
IServer[] ss = ServerManager.getInstance().getServers();
for (int i = 0; i < ss.length; i++) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -40,7 +40,7 @@
librarySet = (LibrarySet)getProperties().get("librarySet"); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -49,7 +49,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String location = extractStepData(0).getProperty("location"); //$NON-NLS-1$
String jarname = librarySet.addJar(location);
getProperties().setProperty("jarname", jarname); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -32,7 +32,7 @@
return p.getProperty("name"); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -41,7 +41,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
LibrarySets.getInstance().addLibrarySet(name);
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.*;
@@ -64,7 +65,7 @@
if(pl.length > 0) setAttributeValue(0, "name", pl[0]); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -73,7 +74,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
version.addLibrary(name);
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -22,6 +22,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
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.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -61,7 +62,7 @@
setAttributeValue(0, "name", selection.getAttributeValue("name")); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -70,7 +71,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
String path = p0.getProperty("page path"); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.IModelNature;
@@ -142,7 +143,7 @@
}
}
- protected void prepareStep(int nextStep) throws Exception {
+ protected void prepareStep(int nextStep) throws XModelException {
if(nextStep == RESOURCES_STEP) {
getProperties().put("ResourcesStep", steps[RESOURCES_STEP]); //$NON-NLS-1$
resourcesStep.init();
@@ -152,7 +153,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
IProject project = getSelectedProject();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.LibrarySets;
@@ -54,7 +55,7 @@
setAttributeValue(0, "templates location", location); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -63,7 +64,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
versions.addVersion(extractStepData(0));
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,6 +13,7 @@
import java.util.Properties;
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.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.helpers.AbstractWebProjectTemplate;
@@ -25,7 +26,7 @@
return EclipseResourceUtil.getModelNature(EclipseResourceUtil.getProject(object)) != null;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
AbstractWebProjectTemplate template = WebProjectTemplateFactory.getTemplate(object);
if(template != null) {
template.addPageTemplate(object);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.eclipse.core.resources.IProject;
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.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.helpers.AbstractWebProjectTemplate;
@@ -30,7 +31,7 @@
return false;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
AbstractWebProjectTemplate template = WebProjectTemplateFactory.getTemplate(object);
IProject project = EclipseResourceUtil.getProject(object);
if(template != null && project != null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -14,6 +14,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
/**
@@ -25,12 +26,16 @@
public CreateWebPrjHandler() {}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if (p == null) p = new Properties();
helper.createProject(object, p);
IProject project = (IProject)object.getModel().getProperties().get("project");
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -15,6 +15,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.*;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.*;
@@ -54,7 +55,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if("Save".equals(name)) { //$NON-NLS-1$
name = FINISH;
}
@@ -65,7 +66,7 @@
return new String[]{"Save", CANCEL}; //$NON-NLS-1$
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
projectTemplate.commit();
getProperties().setProperty("name", projectTemplate.getName()); //$NON-NLS-1$
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -29,6 +29,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
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.impl.FileSystemsImpl;
import org.jboss.tools.common.model.impl.XModelImpl;
@@ -48,12 +49,12 @@
public NewWebProjectHelper() {}
- public void createProject(XModelObject object, Properties p) throws Exception {
+ public void createProject(XModelObject object, Properties p) throws XModelException {
XModel model = object.getModel();
((XModelImpl)model).waitForLoading();
XModelObject webxml = WebAppHelper.getWebApp(model);
- if(webxml == null) throw new Exception("Cannot find web.xml");
+ if(webxml == null) throw new XModelException("Cannot find web.xml");
String location = ((IFile)webxml.getAdapter(IFile.class)).getLocation().toString();
XModelObject webinf = model.getByPath("FileSystems/WEB-INF");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -28,7 +28,7 @@
return true;
}
- public void delete() throws Exception {
+ public void delete() throws XModelException {
XModelObject[] cs = getChildren();
for (int i = 0; i < cs.length; i++) {
DefaultRemoveHandler.removeFromParent(cs[i]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,7 +19,7 @@
public CreateInCollapsedHandler() {}
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
if("false".equals(object.get("expanded")))
XActionInvoker.invoke("SetExpanded", object, null);
super.executeHandler(object, prop);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -36,7 +37,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)) {
execute();
setFinished(true);
@@ -47,7 +48,7 @@
}
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(action != null && action.getName().equals("Edit")) { //$NON-NLS-1$
edit(p);
@@ -57,12 +58,12 @@
getProperties().setProperty("done", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
- void create(Properties p) throws Exception {
+ void create(Properties p) throws XModelException {
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), getEntityData()[0].getModelEntity().getName(), p);
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- void edit(Properties p) throws Exception {
+ void edit(Properties p) throws XModelException {
DefaultEditHandler.edit(getTarget(), p);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,7 +17,7 @@
public class DeleteValidatorHandler extends AbstractHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
((TLDValidatorImpl)object).delete();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -32,7 +32,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;
String v = ("true".equals(object.get("expanded"))) ? "false" : "true";
object.setAttributeValue("expanded", v);
@@ -40,7 +40,7 @@
m.fireStructureChanged(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 {
if(!isEnabled(object, objects)) return;
if(object == null || objects == null || objects.length < 2) {
executeHandler(object, p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -20,6 +20,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.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.WebModelPlugin;
@@ -70,7 +71,7 @@
getProperties().put("groups", groups.keySet().toArray(new String[0])); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -79,7 +80,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
String path = p0.getProperty("tld"); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -25,7 +25,7 @@
return (e != null && e.length() > 0);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(p == null) p = new Properties();
p.setProperty("toErrorTab", "true");
XActionInvoker.invoke("Open", object, p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -21,7 +21,7 @@
return (object != null && getParentFolder(object) != null);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
FolderImpl f = getParentFolder(object);
if(f != null) f.changeChildTimeStamp(object);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -34,7 +35,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)) {
execute();
setFinished(true);
@@ -45,7 +46,7 @@
}
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(action != null && action.getName().equals("Edit")) { //$NON-NLS-1$
edit(p);
@@ -55,12 +56,12 @@
getProperties().setProperty("done", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
- void create(Properties p) throws Exception {
+ void create(Properties p) throws XModelException {
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), getEntityData()[0].getModelEntity().getName(), p);
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- void edit(Properties p) throws Exception {
+ void edit(Properties p) throws XModelException {
DefaultEditHandler.edit(getTarget(), p);
}
18 years
- 1
- 0
JBoss Tools SVN: r7081 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:20:14 -0400 (Mon, 24 Mar 2008)
New Revision: 7081
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/CreateTilesSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/JumpToItemFromOtherFile.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameDefinitionHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameTilesHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/ShowPreferenceHandler.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/CreateTilesSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/CreateTilesSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/CreateTilesSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -26,7 +26,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);
@@ -41,7 +41,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/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -14,12 +14,13 @@
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
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.jst.web.messages.xpl.WebUIMessages;
public class DeleteDefinitionLinkHandler extends AbstractHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String s = object.getAttributeValue("extends"); //$NON-NLS-1$
if(s == null || s.length() == 0) return;
ServiceDialog d = object.getModel().getService();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -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 DeleteTilesHandler extends DeleteFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
boolean unregister = false;
if(TilesRegistrationHelper.isRegistered(object.getModel(), object)) {
String nature = TilesRegistrationHelper.getRegistratorNature(object.getModel());
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/JumpToItemFromOtherFile.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/JumpToItemFromOtherFile.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/JumpToItemFromOtherFile.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -23,7 +23,7 @@
TilesStructureHelper.instance.isNotDefinedInThisFile(object));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject item = TilesStructureHelper.instance.findItemInOtherFile(object);
if(item == null) return;
XModelObject r = TilesStructureHelper.instance.getReference(item);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameDefinitionHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameDefinitionHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameDefinitionHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -26,7 +26,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;
int q = DefaultRenameSupport.run(object, data[0], p);
if(q != 0) return;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameTilesHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameTilesHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/RenameTilesHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -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.jst.web.tiles.model.helpers.TilesRegistrationHelper;
public class RenameTilesHandler 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/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/ShowPreferenceHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/ShowPreferenceHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/ShowPreferenceHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
@@ -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 ShowPreferenceHandler extends AbstractHandler {
@@ -22,7 +23,7 @@
return wizard != null;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(wizard != null) wizard.execute();
}
18 years
- 1
- 0
JBoss Tools SVN: r7080 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model/handlers/bean and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:19:50 -0400 (Mon, 24 Mar 2008)
New Revision: 7080
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java
Log:
JBIDE-893
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -24,7 +24,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = DefaultCreateHandler.extractProperties(data[0]);
String fv = p.getProperty(ATT_TO_VIEW_ID);
if(fv.indexOf("*") >= 0 || fv.length() == 0) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class AddEntrySupport extends SpecialWizardSupport {
@@ -42,7 +43,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -57,7 +58,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(isProperty) {
String kind = action.getProperty("value-kind");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -21,14 +21,13 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String path = object.getAttributeValue(ATT_PATH);
JSFNavigationModel nm = (JSFNavigationModel)object.getParent().getParent();
XModelObject o = object.getModel().createModelObject(ENT_NAVIGATION_RULE, null);
o.setAttributeValue(ATT_FROM_VIEW_ID, path);
o.setAttributeValue("index", "" + nm.getRuleCount(path));
object.getParent().getParent().getChildByPath(FOLDER_NAVIGATION_RULES).addChild(o);
- /*TRIAL_JSF*/
}
- /*TRIAL_JSF_CLASS*/
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -13,12 +13,14 @@
import java.io.File;
import java.util.Properties;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
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.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
@@ -90,7 +92,7 @@
return v;
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -98,12 +100,12 @@
setFinished(true);
}
}
- /*TRIAL_JSF_CLASS*/
+
public String[] getActionNames(int stepId) {
return new String[]{FINISH, CANCEL, HELP};
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
boolean doNotCreateEmptyRule = "yes".equals(JSFPreference.DO_NOT_CREATE_EMPTY_RULE.getValue());
Properties p = extractStepData(0);
String path = p.getProperty("from-view-id");
@@ -242,7 +244,7 @@
return getTarget().getModel().getByPath(path) != null;
}
- void createFile(String path) throws Exception {
+ void createFile(String path) throws XModelException {
if(!canCreateFile(path)) return;
String lastCreateFileValue = getAttributeValue(0, "create file");
JSFModelPlugin.getDefault().getPluginPreferences().setDefault(LAST_CREATE_FILE_PREFERENCE, lastCreateFileValue);
@@ -250,14 +252,18 @@
String template = getAttributeValue(0, "template");
if(template != null) template = template.trim();
File fs = (File)templates.getPageTemplates().get(template);
- if(fs == null || !fs.isFile()) throw new Exception(NLS.bind(JSFUIMessages.TEMPLATE_IS_NOT_FOUND, template));
+ if(fs == null || !fs.isFile()) throw new XModelException(NLS.bind(JSFUIMessages.TEMPLATE_IS_NOT_FOUND, template));
String location = ((FileSystemImpl)getTarget().getModel().getByPath("FileSystems/WEB-ROOT")).getAbsoluteLocation();
location += path;
File ft = new File(location);
ft.getParentFile().mkdirs();
FileUtil.copyFile(fs, ft);
getTarget().getModel().update();
- EclipseResourceUtil.getResource(getTarget()).getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
+ try {
+ EclipseResourceUtil.getResource(getTarget()).getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
protected DefaultWizardDataValidator viewValidator = new ViewValidator();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -23,7 +23,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/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -48,7 +48,7 @@
return object != null && object.isObjectEditable() && isNewValueKind(object, action.getProperty(ATT_CONTENT_KIND));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
if(!checkChangeSignificance(object)) return;
String targetValueKind = action.getProperty(ATT_CONTENT_KIND);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -32,7 +32,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -47,7 +47,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
getTarget().getModel().changeObjectAttribute(getTarget(), "value-kind", "value");
getTarget().getModel().changeObjectAttribute(getTarget(), "value", p.getProperty("value"));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -49,7 +49,7 @@
return object != null && object.isObjectEditable() && isNewValueKind(object, action.getProperty("value-kind"));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
if(!checkChangeSignificance(object)) return;
String targetValueKind = action.getProperty("value-kind");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -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;
/*TRIAL_JSF*/
super.executeHandler(object, p);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -43,7 +43,7 @@
return data;
}
- 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);
/*TRIAL_JSF*/
@@ -66,16 +66,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"));
if(!register) return;
XModelObject webxml = WebAppHelper.getWebApp(object.getModel());
- if(webxml == null) throw new Exception ("Faces config cannot be registered because web.xml is not found.");
- if("yes".equals(webxml.get("isIncorrect"))) throw new Exception ("Faces config file cannot be registered because web.xml is incorrect.");
- if(!webxml.isObjectEditable()) throw new Exception ("Faces config file cannot be registered because web.xml is read only.");
+ if(webxml == null) throw new XModelException ("Faces config cannot be registered because web.xml is not found.");
+ if("yes".equals(webxml.get("isIncorrect"))) throw new XModelException ("Faces config file cannot be registered because web.xml is incorrect.");
+ if(!webxml.isObjectEditable()) throw new XModelException ("Faces config file cannot be registered because web.xml is read only.");
}
- private void register(XModelObject object, Properties prop) throws Exception {
+ private void register(XModelObject object, Properties prop) throws XModelException {
boolean register = "yes".equals(extractProperties(data[0]).getProperty("register in web.xml"));
if(!register) return;
String uri = "/WEB-INF/" + FileAnyImpl.toFileName(created);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -51,7 +51,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
XUndoManager undo = getTarget().getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("Create faces config in " + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD);
@@ -66,7 +66,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);
@@ -81,7 +81,7 @@
open(file);
}
- private void register(XModelObject object, XModelObject created, Properties prop) throws Exception {
+ private void register(XModelObject object, XModelObject created, Properties prop) throws XModelException {
boolean register = "yes".equals(getAttributeValue(0, "register in web.xml"));
if(!register) return;
String uri = getURI(created);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -18,7 +18,7 @@
public class DeleteFacesConfigHandler extends DeleteFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(object);
if(object.getModel().getByPath("FileSystems/WEB-INF" + path) == object) {
path = "/WEB-INF" + path;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -36,7 +36,7 @@
return (path == null || path.length() == 0) ? null : object.getModel().getByPath(path);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
ReferenceGroupImpl g = (ReferenceGroupImpl)object;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,7 @@
public class DeleteManagedBeanHandler extends DefaultRemoveHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
boolean unregister = false;
IFile f = getJavaFile(object);
if(f != null) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
import java.util.*;
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.jsf.JSFPreference;
import org.jboss.tools.jsf.model.JSFConstants;
@@ -19,7 +20,7 @@
public class DeleteOutputHandler extends DefaultRemoveHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject caseObject = JSFProcessStructureHelper.instance.getReference(object);
if(caseObject == null) return;
XModelObject group = object.getParent().getParent();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -29,7 +29,7 @@
return (path == null || path.length() == 0) ? null : object.getModel().getByPath(path);
}
- 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;
XModelObject page = getPage(object);
if(page == null) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
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;
@@ -21,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 = JSFProcessStructureHelper.instance.getProcess(object);
if(process != null && JSFProcessStructureHelper.instance.isProcessLoaded(process)) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -27,7 +27,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 = getLinks(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -27,7 +27,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/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,13 +12,14 @@
import java.util.*;
import org.jboss.tools.common.meta.action.impl.handlers.MoveHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XOrderedObject;
import org.jboss.tools.jsf.model.ReferenceObjectImpl;
public class OutputMoveHandler extends MoveHandler {
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
if(!isEnabled(object)) return;
ReferenceObjectImpl o1 = (ReferenceObjectImpl)object;
ReferenceObjectImpl o2 = (ReferenceObjectImpl)object.getModel().getModelBuffer().source();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -13,6 +13,7 @@
import java.util.*;
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.common.model.util.XModelObjectLoaderUtil;
@@ -20,7 +21,7 @@
public class RenameFacesConfigHandler extends DefaultEditHandler {
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
//prompt file object to compute body.
((FileAnyImpl)object).getAsText();
String oldConfigName = FileAnyImpl.toFileName(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -20,7 +20,6 @@
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.*;
-import org.jboss.tools.jsf.model.handlers.AddViewSupport.ViewValidator;
import org.jboss.tools.jsf.model.helpers.*;
import org.jboss.tools.jsf.model.impl.NavigationRuleObjectImpl;
@@ -49,7 +48,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -64,7 +63,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
String path = AddViewSupport.revalidatePath(p.getProperty(ATT_FROM_VIEW_ID));
if(initialPath.equals(path)) return;
@@ -76,7 +75,11 @@
} else {
replace(group, initialPath, path);
if(page != null && "true".equals(p.getProperty("rename file")) && isFieldEditorEnabled(0, "rename file", p)) {
- renameFile(page, path);
+ try {
+ renameFile(page, path);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
} finally {
@@ -156,7 +159,7 @@
}
}
- public static void renameFile(XModelObject page, String path) throws Exception {
+ public static void renameFile(XModelObject page, String path) throws XModelException, CoreException {
IResource r = (IResource)page.getAdapter(IResource.class);
String initialPath = XModelObjectLoaderUtil.getResourcePath(page);
String p = r.getFullPath().toString();
@@ -168,12 +171,12 @@
page.getModel().update();
}
- public static void provideParent(IResource resource) throws Exception {
+ public static void provideParent(IResource resource) throws XModelException, CoreException {
IResource parent = resource.getParent();
if(parent.exists()) return;
IFolder folder = resource.getWorkspace().getRoot().getFolder(parent.getFullPath());
provideParent(folder);
- if(!folder.exists()) folder.create(true, true, null);
+ folder.create(true, true, null);
}
/*
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -18,6 +18,7 @@
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.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.pv.JSFProjectBean;
@@ -67,7 +68,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)) {
Properties p = extractStepData(0);
getProperties().setProperty(ATTR_SELECTED, p.getProperty(ATTR_SELECTED));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,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/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject child = object.getChildByPath(NAME_APPLICATION);
if(child == null) {
String childEntity = getApplicationEntity(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -24,7 +24,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject child = object.getChildByPath(NAME_FACTORY);
if(child == null) child = object.getModel().createModelObject(ENTITY_FACTORY, null);
long ts = child.getTimeStamp();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,10 +11,13 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.java.generation.*;
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.util.EclipseJavaUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
@@ -72,7 +75,7 @@
values[i] = v;
}
- public void addProperties(XModelObject bean) throws Exception {
+ public void addProperties(XModelObject bean) throws XModelException, CoreException {
List<PropertyData> toGenerate = new ArrayList<PropertyData>();
int applyForAll = 0;
for (int i = 0; i < names.length; i++) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,11 +11,14 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.java.generation.*;
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintQClassName;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -50,7 +53,7 @@
if(isLight) setAttributeValue(0, "generate source code", "false");
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -74,18 +77,22 @@
return new String[]{BACK, FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
String entity = action.getProperty("entity");
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p);
- if(getStepId() == 1) {
- propertiesContext.addProperties(c);
+ try {
+ if(getStepId() == 1) {
+ propertiesContext.addProperties(c);
+ }
+ if(isGenerationOn()) generate();
+ } catch (CoreException e) {
+ throw new XModelException(e);
}
- if(isGenerationOn()) generate();
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- boolean isGenerationOn() throws Exception {
+ boolean isGenerationOn() throws XModelException {
Properties p = extractStepData(0);
if(!"true".equals(p.getProperty("generate source code"))) return false;
if(!isFieldEditorEnabled(0, "generate source code", p)) return false;
@@ -117,7 +124,7 @@
return true;
}
- void generate() throws Exception {
+ void generate() throws CoreException {
Properties input = getGenerateProperties();
generator.setInput(input);
generator.generate();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -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 AddManagedPropertySafeHandler extends AbstractHandler {
@@ -24,7 +25,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;
XActionInvoker.invoke("CreateActions.CreateProperty", object, p);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
import java.util.*;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.JavaModelException;
@@ -20,6 +21,7 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintJavaName;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -71,7 +73,7 @@
if(isLight) setAttributeValue(0, "add java property", "false");
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -86,7 +88,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
getTarget().setAttributeValue("content-kind", "properties");
String entity = action.getProperty("entity");
@@ -94,7 +96,11 @@
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
getProperties().put("created", c);
if(!isGenerationOn(p)) return;
- generate(p);
+ try {
+ generate(p);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
boolean isGenerationOn(Properties p) {
@@ -125,7 +131,7 @@
return (m == null) ? null : EclipseJavaUtil.getMemberTypeAsString(m);
}
- void generate(Properties p) throws Exception {
+ void generate(Properties p) throws CoreException {
generator.setOwner(classCheck.getExistingClass());
String type = p.getProperty("property-class");
if(type.length() == 0) type = "String";
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
@@ -26,7 +28,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
ServiceDialog d = object.getModel().getService();
IMember member = ManagedBeanHelper.getMember(object);
String title = DefaultCreateHandler.title(object, false);
@@ -45,12 +47,16 @@
}
DefaultRemoveHandler.removeFromParent(object);
if(deleteField) {
- IMember[] ms = findRelevantMembers(member);
- for (int i = 0; i < ms.length; i++) ms[i].delete(true, null);
+ try {
+ IMember[] ms = findRelevantMembers(member);
+ for (int i = 0; i < ms.length; i++) ms[i].delete(true, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
- private IMember[] findRelevantMembers(IMember member) throws Exception {
+ private IMember[] findRelevantMembers(IMember member) throws CoreException {
List<IMember> list = new ArrayList<IMember>();
list.add(member);
IType type = member.getDeclaringType();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -32,14 +32,14 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if (!isEnabled(object)) return;
XUndoManager undo = object.getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("rename " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT);
undo.addUndoable(u);
try {
transaction(object, p);
- } catch (Exception e) {
+ } catch (XModelException e) {
undo.rollbackTransactionInProgress();
throw e;
} finally {
@@ -47,7 +47,7 @@
}
}
- protected void transaction(XModelObject object, Properties p) throws Exception {
+ protected void transaction(XModelObject object, Properties p) throws XModelException {
IType type = ManagedBeanHelper.getType(object);
if(type != null && !type.isBinary()) {
RenameManagedBeanClassRunnable r = new RenameManagedBeanClassRunnable(object, type);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.eclipse.jdt.ui.refactoring.RenameSupport;
import org.eclipse.swt.widgets.Shell;
@@ -29,13 +31,14 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
IMember member = ManagedBeanHelper.getMember(object);
String name = object.getAttributeValue("property-name");
if(member != null) {
name = member.getElementName();
RenameSupport renameSupport = null;
+ try {
if (member instanceof IField)
renameSupport = RenameSupport.create((IField)member, null, RenameSupport.UPDATE_REFERENCES | RenameSupport.UPDATE_GETTER_METHOD | RenameSupport.UPDATE_SETTER_METHOD);
else if (member instanceof IMethod)
@@ -44,6 +47,9 @@
Shell shell = ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
renameSupport.openDialog(shell);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
} else {
JSFRenameFieldProcessor processor = new JSFRenameFieldProcessor();
processor.setModelObject(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -33,7 +33,7 @@
return IPathSourceImpl.getPath(object) != null;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
context.execute(object);
/*TRIAL_JSF*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -49,7 +49,7 @@
setAttributeValue(0, ATTR_CAPABILITY, options[0]);
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
boolean b = executeWithContext();
if(b) setStepId(1);
@@ -65,11 +65,15 @@
return new String[]{CLOSE, HELP};
}
- protected boolean executeWithContext() throws Exception {
+ protected boolean executeWithContext() throws XModelException {
IRunnableContext context = (IRunnableContext)getProperties().get("IRunnableContext");
final Executor executor = new Executor();
- context.run(false, true, executor);
- if(executor.exception != null) throw executor.exception;
+ try {
+ context.run(false, true, executor);
+ } catch (Exception e) {
+ throw new XModelException(e);
+ }
+ if(executor.exception != null) throw new XModelException(executor.exception);
getProperties().put("addedCapabilities", (executor.added != null) ? executor.added : new String[0]);
return !executor.cancelled;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,7 @@
package org.jboss.tools.jsf.project.capabilities;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class CapabilitiesPerformer extends PerformerItem {
@@ -37,7 +38,7 @@
return capabilities;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
boolean b = true;
for (int i = 0; i < capabilities.length; i++) {
if(!capabilities[i].isSelected()) continue;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -39,7 +39,7 @@
fileAdditionsPerformer.init(model, capability);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
context.monitor.worked(1);
context.monitor.subTask(getDisplayName());
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -71,7 +71,7 @@
return true;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
if(targetAttribute != null && attributeValue != null) {
targetObject.getModel().editObjectAttribute(targetObject, targetAttribute, attributeValue);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -105,7 +105,7 @@
return (f == null) ? null : EclipseResourceUtil.getObjectByResource(f);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
for (int i = 0; i < performers.length; i++) {
if(performers[i].isSelected()) performers[i].execute(context);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.project.capabilities;
+import org.jboss.tools.common.model.XModelException;
+
public interface IPerformerItem {
public String getDisplayName();
public IPerformerItem getParent();
@@ -18,5 +20,5 @@
public boolean isSelected();
public void setSelected(boolean enabled);
public boolean isEnabled();
- public boolean execute(PerformerContext context) throws Exception;
+ public boolean execute(PerformerContext context) throws XModelException;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -136,7 +136,7 @@
return l.toArray(new String[0]);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
boolean changed = false;
boolean zip = false;
@@ -196,7 +196,11 @@
}
}
if(changed) {
- libResource.refreshLocal(IResource.DEPTH_INFINITE, null);
+ try {
+ libResource.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
model.save();
}
if(zip) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.project.capabilities;
+import org.jboss.tools.common.model.XModelException;
+
public abstract class PerformerItem implements IPerformerItem {
protected IPerformerItem parent;
protected boolean selected = true;
@@ -47,7 +49,7 @@
return true;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
throw new RuntimeException("Not implemented in " + getClass().getName());
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -41,7 +41,7 @@
return null;
}
- private void checkCorrectness() throws Exception {
+ private void checkCorrectness() throws XModelException {
}
public void updateProject() {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -19,6 +19,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();
fss = model.getByPath("FileSystems");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.web.helpers.context;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.JSFWebHelper;
@@ -27,11 +28,11 @@
createAllModules();
}
- protected void loadWebXML(String body, String location) throws Exception {
+ protected void loadWebXML(String body, String location) throws XModelException {
super.loadWebXML(body, location);
if(WebAppHelper.findServlet(webxml, "javax.faces.webapp.FacesServlet", null) == null) {
String webXMLErrorMessage = "No JSF support found in the project.";
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
}
18 years
- 1
- 0
JBoss Tools SVN: r7079 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-24 11:18:50 -0400 (Mon, 24 Mar 2008)
New Revision: 7079
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java
Log:
JBIDE-893
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java 2008-03-24 15:18:33 UTC (rev 7078)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
@@ -98,7 +98,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -108,7 +108,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
getTarget().setAttributeValue("location", p0.getProperty("location"));
if(p0.containsKey("prefix")) {
18 years
- 1
- 0