JBoss Tools SVN: r7351 - trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:33:09 -0400 (Fri, 04 Apr 2008)
New Revision: 7351
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/LinkRecognizerPreferencePage.java
Log:
JBIDE-893
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/LinkRecognizerPreferencePage.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/LinkRecognizerPreferencePage.java 2008-04-04 16:31:51 UTC (rev 7350)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/LinkRecognizerPreferencePage.java 2008-04-04 16:33:09 UTC (rev 7351)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.ui.preferences;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.objecteditor.XChildrenEditor;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.widgets.Composite;
@@ -17,6 +18,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.engines.impl.EnginesLoader;
import org.jboss.tools.common.model.util.AbstractTableHelper;
@@ -49,13 +51,21 @@
}
public boolean performOk() {
- EnginesLoader.merge(linkRecognizer.getModelObject(), object);
+ try {
+ EnginesLoader.merge(linkRecognizer.getModelObject(), object);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
linkRecognizer.save();
return true;
}
protected void performDefaults() {
- linkRecognizer.restoreDefaults(object);
+ try {
+ linkRecognizer.restoreDefaults(object);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
linksEditor.update();
}
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7350 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts: model and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:31:51 -0400 (Fri, 04 Apr 2008)
New Revision: 7350
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java
Log:
JBIDE-893
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -12,7 +12,9 @@
import org.jboss.tools.common.log.IPluginLog;
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.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -39,12 +41,16 @@
XModel initialModel = PreferenceModelUtilities.createPreferenceModel(p);
if (initialModel != null)
{
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.USE_DEFAULT_PROJECT_ROOT);
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_STRUTS_VERSION);
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_TEMPLATE);
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_ROOT_DIR);
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_TLD_SET);
- PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.REMOVE_PAGE_AND_FILE);
+ try {
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.USE_DEFAULT_PROJECT_ROOT);
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_STRUTS_VERSION);
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_TEMPLATE);
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_ROOT_DIR);
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_TLD_SET);
+ PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.REMOVE_PAGE_AND_FILE);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
PreferenceModelUtilities.getPreferenceModel().save();
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -15,6 +15,7 @@
import org.osgi.framework.Bundle;
import org.jboss.tools.common.model.XModelConstants;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.ModelNature;
@@ -54,10 +55,14 @@
if (obsoleteVersion) {
Bundle bundle = ModelPlugin.getDefault().getBundle();
String version = (String) bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
+ try {
model.changeObjectAttribute(
FileSystemsHelper.getFileSystems(model),
XModelConstants.MODEL_VERSION, version
);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
model.save();
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -13,6 +13,7 @@
import java.io.File;
import java.util.*;
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.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.project.helpers.*;
@@ -86,7 +87,11 @@
}
public void setDefaultTemplate(String template) {
- StrutsPreference.DEFAULT_PROJECT_TEMPLATE.setValue(template);
+ try {
+ StrutsPreference.DEFAULT_PROJECT_TEMPLATE.setValue(template);
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
}
public String getDefaultPageTemplate() {
@@ -95,7 +100,11 @@
}
public void setDefaultPageTemplate(String template) {
- StrutsPreference.DEFAULT_PAGE_TEMPLATE.setValue(template);
+ try {
+ StrutsPreference.DEFAULT_PAGE_TEMPLATE.setValue(template);
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
}
protected String getWizardEntitySuffix() {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.model;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.impl.*;
@@ -31,7 +32,7 @@
return new OrderedByEntityChildren();
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if("unknown".equals(name) && "true".equals(newValue)) {
if(!isActive()) return;
XModelObject[] s = getParent().getChildren(getModelEntity().getName());
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.model.filesystems.*;
import org.jboss.tools.common.model.filesystems.impl.*;
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.*;
import java.io.*;
@@ -142,6 +143,8 @@
f.setUpdateLock();
try {
f.edit(body, true);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
} finally {
f.releaseUpdateLock();
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -23,7 +23,7 @@
return isAdoptableAction(object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableAction(object)) adoptAction(target, object, p);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -24,7 +24,7 @@
return object != null && "FilePROPERTIES".equals(object.getModelEntity().getName());
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(object);
String ext = ".properties";
if(path == null || !path.toLowerCase().endsWith(ext) || !path.startsWith("/")) return;
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -55,7 +55,7 @@
}
}
- private void renameConfigInWebXML(XModel model, String module, String oldURI, String newURI) {
+ private void renameConfigInWebXML(XModel model, String module, String oldURI, String newURI) throws XModelException {
XModelObject webxml = WebAppHelper.getWebApp(model);
if(webxml == null) return;
XModelObject servlet = StrutsWebHelper.findServlet(webxml);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -25,7 +25,7 @@
public class SetupModuleHandler implements StrutsConstants {
- public static void setupModule(XModelObject object, String module, String fsname) {
+ public static void setupModule(XModelObject object, String module, String fsname) throws XModelException {
XModel model = object.getModel();
if (module.length() > 0 && module.charAt(0) != '/') {
throw new RuntimeException(StrutsUIMessages.MODULE_NAME);
@@ -122,7 +122,7 @@
return s;
}
- private static XModelObject createFileSystem(XModelObject webroot, String module) {
+ private static XModelObject createFileSystem(XModelObject webroot, String module) throws XModelException {
XModel model = webroot.getModel();
String mn = module;
if(mn.startsWith("/")) mn = mn.substring(1);
@@ -143,7 +143,7 @@
return fs;
}
- private static XModelObject createFolder(XModelObject parent, String path) {
+ private static XModelObject createFolder(XModelObject parent, String path) throws XModelException {
int i = path.indexOf('/');
String part = (i < 0) ? path : path.substring(0, i);
XModelObject folder = parent.getChildByPath(part);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -26,7 +26,7 @@
/** Creates a new instance of StrutsAdoptManager */
public StrutsAdoptManager() {}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableJSP(target, object)) {
adoptJSP(target, object, p);
} else if(isAdoptableProcessItem(target, object)) {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -8,6 +8,7 @@
import org.jboss.tools.struts.model.helpers.*;
import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
/**
@@ -22,7 +23,7 @@
public StrutsLinkManager() {
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
helper.link(target, object, p);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -138,7 +138,7 @@
static String ENT_ACTION_11 = StrutsConstants.ENT_ACTION + StrutsConstants.VER_SUFFIX_11;
static String ENT_ACTION_12 = StrutsConstants.ENT_ACTION + StrutsConstants.VER_SUFFIX_12;
- protected boolean insertReference(XModelObject parent, String entity, XModelObject o, Properties p) {
+ protected boolean insertReference(XModelObject parent, String entity, XModelObject o, Properties p) throws XModelException {
if((!entity.equals(ENT_ACTION_11) && !entity.equals(ENT_ACTION_12))
|| o.getParent() == parent) return false;
XModelObject process = StrutsProcessStructureHelper.instance.getProcess(parent);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -85,7 +85,7 @@
return null;
}
- public static void changeMatchingAttributesInHierarhy(XModelObject object, String oldpath, String newpath) {
+ public static void changeMatchingAttributesInHierarhy(XModelObject object, String oldpath, String newpath) throws XModelException {
RenamePageHandler.changeMatchingAttributes(object, oldpath, newpath);
XModelObject[] os = object.getChildrenForSave();
for (int i = 0; i < os.length; i++) {
@@ -96,7 +96,7 @@
static String[] PATH_ATTRIBUTES = new String[]{"path", "include", "forward", "input"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- public static void changeMatchingAttributes(XModelObject ref, String oldpath, String path) {
+ public static void changeMatchingAttributes(XModelObject ref, String oldpath, String path) throws XModelException {
for (int i = 0; i < PATH_ATTRIBUTES.length; i++) {
if(oldpath.equals(ref.getAttributeValue(PATH_ATTRIBUTES[i]))) {
ref.getModel().changeObjectAttribute(ref, PATH_ATTRIBUTES[i], path);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -222,7 +222,7 @@
createPage(getTarget(), fullpath, getProperties());
}
- public static XModelObject createPage(XModelObject process, String path, Properties p) {
+ public static XModelObject createPage(XModelObject process, String path, Properties p) throws XModelException {
XModelObject item = StrutsProcessHelper.createPage(process, path);
String x = (p == null) ? null : p.getProperty("process.mouse.x");
String y = (p == null) ? null : p.getProperty("process.mouse.y");
@@ -257,7 +257,7 @@
createFile(fs, path, body);
}
- public static void createFile(XModelObject fs, String path, String body) {
+ public static void createFile(XModelObject fs, String path, String body) throws XModelException {
StringTokenizer st = new StringTokenizer(path, "/");
int c = st.countTokens(), i = 0;
while(i < c - 1) {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -79,7 +79,7 @@
return LINK_TYPES[targetType][objectType] != U_K;
}
- public void link(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void link(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if (target == null || object == null) return;
XModelObject config = getConfig(target, object);
if (config == null) return;
@@ -147,7 +147,7 @@
}
}
- private void redirect_link(XModelObject object, String target, String path, String attr) {
+ private void redirect_link(XModelObject object, String target, String path, String attr) throws XModelException {
XUndoManager undo = object.getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("redirect " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); //$NON-NLS-1$
undo.addUndoable(u);
@@ -172,7 +172,7 @@
}
}
- private void redirect(XModelObject object, String target, String path) {
+ private void redirect(XModelObject object, String target, String path) throws XModelException {
XUndoManager undo = object.getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("redirect " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); //$NON-NLS-1$
undo.addUndoable(u);
@@ -198,7 +198,7 @@
}
}
- private XModelObject createLink(XModelObject page, String target, String path) {
+ private XModelObject createLink(XModelObject page, String target, String path) throws XModelException {
XModelObject link = findDuplicateLink(page, target, path);
if(link != null) return link;
String name = StrutsProcessHelper.createName(page, "link"); //$NON-NLS-1$
@@ -218,7 +218,7 @@
return link;
}
- private XModelObject createForward(XModelObject action, String path) {
+ private XModelObject createForward(XModelObject action, String path) throws XModelException {
String name = path.substring(path.lastIndexOf('/')+1);
int dot = name.indexOf('.');
if (dot != -1) name = name.substring(0, dot);
@@ -302,7 +302,7 @@
return config;
}
- private XModelObject findDuplicateLink(XModelObject object, String target, String path) {
+ private XModelObject findDuplicateLink(XModelObject object, String target, String path) throws XModelException {
if(!TYPE_PAGE.equals(object.getAttributeValue("type"))) return null; //$NON-NLS-1$
XModelObject[] cs = object.getChildren();
for (int i = 0; i < cs.length; i++) {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -84,7 +84,7 @@
links.update(object);
}
- public void restoreDefaults(XModelObject object) {
+ public void restoreDefaults(XModelObject object) throws XModelException {
EnginesLoader.merge(object, load(getDefaultValue()));
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -24,7 +24,7 @@
public ReplaceConfirmedLinkHelper() {}
- public boolean replace(XModelObject link, String newpath, String attr) {
+ public boolean replace(XModelObject link, String newpath, String attr) throws XModelException {
UrlPattern up = StrutsProcessStructureHelper.instance.getUrlPattern(link);
String jsppath = link.getParent().getAttributeValue(ATT_PATH);
XModelObject jsp = StrutsProcessStructureHelper.instance.findReferencedJSPInCurrentModule(link.getParent());
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -16,6 +16,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
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;
import org.jboss.tools.common.model.util.XModelObjectUtil;
import org.jboss.tools.struts.webprj.model.helpers.WebModulesHelper;
@@ -41,6 +42,15 @@
public int execute() {
if(cfg == null) return 1;
+ try {
+ return doExecute();
+ } catch (XModelException e) {
+ if(p != null) p.put("exception", e);
+ return 1;
+ }
+ }
+
+ private int doExecute() throws XModelException {
if(test) {
return test();
} else if(path == null && oldPath != null) {
@@ -56,16 +66,16 @@
return 0;
}
- void append() {
+ void append() throws XModelException {
XModelObject plugin = getPlugin(true);
XModelObject property = getSetProperty(plugin, true);
addPathIfNeeded(property, path);
}
- protected void modifyProperties(XModelObject plugin) {
+ protected void modifyProperties(XModelObject plugin) throws XModelException {
}
- void replace() {
+ void replace() throws XModelException {
boolean isDefault = isOldNameDefault();
XModelObject plugin = getPlugin(isDefault);
if(plugin == null) return;
@@ -73,14 +83,14 @@
replacePath(property);
}
- void remove() {
+ void remove() throws XModelException {
XModelObject plugin = getPlugin(false);
if(plugin == null) return;
XModelObject property = getSetProperty(plugin, false);
replacePath(property);
}
- private XModelObject getPlugin(boolean create) {
+ private XModelObject getPlugin(boolean create) throws XModelException {
XModelObject plugins = cfg.getChildByPath("plug-ins");
XModelObject[] os = plugins.getChildren();
for (int i = 0; i < os.length; i++) {
@@ -94,11 +104,11 @@
return plugin;
}
- private XModelObject getSetProperty(XModelObject plugin, boolean create) {
+ private XModelObject getSetProperty(XModelObject plugin, boolean create) throws XModelException {
return getSetProperty(plugin, getSetPropertyName(), create, getDefaultSetPropertyValue());
}
- protected XModelObject getSetProperty(XModelObject plugin, String name, boolean create, String value) {
+ protected XModelObject getSetProperty(XModelObject plugin, String name, boolean create, String value) throws XModelException {
XModelObject[] ps = plugin.getChildren();
for (int i = 0; i < ps.length; i++) {
if(name.equals(ps[i].getAttributeValue("property"))) {
@@ -113,7 +123,7 @@
return property;
}
- private void addPathIfNeeded(XModelObject property, String path) {
+ private void addPathIfNeeded(XModelObject property, String path) throws XModelException {
String value = property.getAttributeValue("value");
String[] array = XModelObjectUtil.asStringArray(value);
StringBuffer sb = new StringBuffer();
@@ -128,7 +138,7 @@
property.getModel().changeObjectAttribute(property, "value", value);
}
- private void replacePath(XModelObject property) {
+ private void replacePath(XModelObject property) throws XModelException {
String value = property.getAttributeValue("value");
String[] s = XModelObjectUtil.asStringArray(value);
StringBuffer sb = new StringBuffer();
@@ -154,7 +164,7 @@
property.getModel().changeObjectAttribute(property, "value", value);
}
- int test() {
+ int test() throws XModelException {
if(path == null) return 1;
XModelObject plugin = getPlugin(false);
if(plugin == null) return 1;
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.plugins.model.handlers;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class TilesFileRegistration extends PluginRegistration {
@@ -22,11 +23,11 @@
return "definitions-config";
}
- protected void modifyProperties(XModelObject plugin) {
+ protected void modifyProperties(XModelObject plugin) throws XModelException {
setModuleAwareIfNeeded(plugin);
}
- private void setModuleAwareIfNeeded(XModelObject plugin) {
+ private void setModuleAwareIfNeeded(XModelObject plugin) throws XModelException {
XModelObject property = getSetProperty(plugin, "moduleAware", true, null);
String value = property.getAttributeValue("value");
if(value.length() == 0) {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -22,7 +22,7 @@
return isAdoptableTag(target, object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableTag(target, object)) adoptTag(target, object, p);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -34,7 +34,7 @@
return entity.startsWith(StrutsConstants.ENT_ACTION);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
String entity = XModelEntityResolver.resolveEntity(target, ValidatorConstants.ENT_FORM);
XModelObject o = object.getModel().createModelObject(entity, null);
String attr = (isAction(object.getModelEntity().getName())) ? "path" : "name";
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -13,6 +13,7 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.*;
import org.jboss.tools.common.model.*;
+
import java.util.*;
/**
@@ -90,7 +91,7 @@
c.setValues(vs);
}
- protected void changeAttributeValue(XModelObject object, String name, String value) {
+ protected void changeAttributeValue(XModelObject object, String name, String value) throws XModelException {
object.getModel().changeObjectAttribute(object, name, value);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -148,7 +148,7 @@
}
}
- public XModelObject setModule(XModel model, String oldname, String name, String modelpath, String rootfilesystem) {
+ public XModelObject setModule(XModel model, String oldname, String name, String modelpath, String rootfilesystem) throws XModelException {
XModelObject web = model.getByPath("Web");
XModelObject module = (oldname == null || oldname.length() == 0) ? null : web.getChildByPath(oldname);
if(module == null) module = web.getChildByPath(name);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -12,6 +12,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
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.jst.web.model.helpers.WebAppHelper;
@@ -22,27 +23,27 @@
return WebAppHelper.findServlet(webxml, ACTION_SERVLET, "action");
}
- public static XModelObject getServlet(XModelObject webxml) {
+ public static XModelObject getServlet(XModelObject webxml) throws XModelException {
return WebAppHelper.findOrCreateServlet(webxml, ACTION_SERVLET, "action", -1);
}
- public static void revalidateInitParam(XModelObject servlet, String modulename, String uri) {
+ public static void revalidateInitParam(XModelObject servlet, String modulename, String uri) throws XModelException {
WebAppHelper.setWebAppInitParam(servlet, "config" + modulename, uri);
}
- public static void revalidateInitParam(XModel model, String modulename, String uri) {
+ public static void revalidateInitParam(XModel model, String modulename, String uri) throws XModelException {
XModelObject webxml = WebAppHelper.getWebApp(model);
if(webxml == null) return;
XModelObject servlet = getServlet(webxml);
if(servlet != null) revalidateInitParam(servlet, modulename, uri);
}
- public static String registerConfig(XModelObject servlet, String modulename, String uri) {
+ public static String registerConfig(XModelObject servlet, String modulename, String uri) throws XModelException {
XModelObject init = WebAppHelper.appendToWebAppInitParam(servlet, "config" + modulename, uri);
return init == null ? "" : init.getAttributeValue("param-value");
}
- public static String registerConfig(XModel model, String modulename, String uri) {
+ public static String registerConfig(XModel model, String modulename, String uri) throws XModelException {
XModelObject webxml = WebAppHelper.getWebApp(model);
if(webxml == null) return null;
XModelObject servlet = getServlet(webxml);
@@ -65,7 +66,7 @@
return false;
}
- public static void unregisterConfig(XModel model, String uri) {
+ public static void unregisterConfig(XModel model, String uri) throws XModelException {
XModelObject webxml = WebAppHelper.getWebApp(model);
XModelObject servlet = WebAppHelper.findServlet(webxml, ACTION_SERVLET, "action");
if(servlet == null) return;
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-04-04 16:30:22 UTC (rev 7349)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-04-04 16:31:51 UTC (rev 7350)
@@ -503,7 +503,7 @@
revalidateSrcFileSystem(m);
}
- private XModelObject createFileSystem(String name, String location, String info) {
+ private XModelObject createFileSystem(String name, String location, String info) throws XModelException {
XModelObject fs = model.createModelObject("FileSystemFolder", null); //$NON-NLS-1$
fs.setAttributeValue("name", name); //$NON-NLS-1$
fs.setAttributeValue("location", location); //$NON-NLS-1$
@@ -513,7 +513,7 @@
return fs;
}
- private XModelObject adoptOrCreateFileSystem(String name, String location, String info) {
+ private XModelObject adoptOrCreateFileSystem(String name, String location, String info) throws XModelException {
XModelObject fs = model.getByPath("FileSystems/" + name); //$NON-NLS-1$
if(fs != null && location.equals(fs.getAttributeValue("location"))) { //$NON-NLS-1$
if(info != null) model.changeObjectAttribute(fs, "info", info); //$NON-NLS-1$
@@ -544,7 +544,7 @@
m.getModel().changeObjectAttribute(m, ATTR_ROOT_FS, fs.getAttributeValue("name")); //$NON-NLS-1$
}
- private XModelObject revalidateModuleFileSystem(String name, String location, String info) {
+ private XModelObject revalidateModuleFileSystem(String name, String location, String info) throws XModelException {
XModelObject fs = (XModelObject)oldFileSystems.get(location);
if(fs != null && name.equals(fs.getAttributeValue("name"))) { //$NON-NLS-1$
if(info != null) model.changeObjectAttribute(fs, "info", info); //$NON-NLS-1$
@@ -597,7 +597,7 @@
m.getModel().changeObjectAttribute(m, ATTR_SRC_FS, fs.getAttributeValue("name")); //$NON-NLS-1$
}
- private XModelObject revalidateSrcFileSystem(String name, String location, String info) {
+ private XModelObject revalidateSrcFileSystem(String name, String location, String info) throws XModelException {
XModelObject fs = (XModelObject)oldFileSystems.remove(location);
if(fs != null) {
newFileSystems.put(location, fs);
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7349 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:30:22 -0400 (Fri, 04 Apr 2008)
New Revision: 7349
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/PropertiesScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
Log:
JBIDE-893
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/PropertiesScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/PropertiesScanner.java 2008-04-04 16:29:41 UTC (rev 7348)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/PropertiesScanner.java 2008-04-04 16:30:22 UTC (rev 7349)
@@ -17,8 +17,10 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
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.filesystems.impl.FolderImpl;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.internal.core.InnerModelHelper;
import org.jboss.tools.seam.internal.core.SeamPropertiesDeclaration;
@@ -73,7 +75,13 @@
if(o.getParent() instanceof FolderImpl) {
IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(source);
- if(f != null && f.exists()) ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile());
+ if(f != null && f.exists()) {
+ try {
+ ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile());
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
+ }
}
LoadedDeclarations ds = new LoadedDeclarations();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-04-04 16:29:41 UTC (rev 7348)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-04-04 16:30:22 UTC (rev 7349)
@@ -21,8 +21,10 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.XModelEntity;
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.filesystems.impl.FolderImpl;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -112,7 +114,11 @@
if(o.getParent() instanceof FolderImpl) {
IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(source);
if(f != null && f.exists()) {
- ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile());
+ try {
+ ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile());
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
if(o.getParent() == null) {
boolean b = isLikelyComponentSource(f);
if(!b) return null;
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7348 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: operation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:29:41 -0400 (Fri, 04 Apr 2008)
New Revision: 7348
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-04-04 16:24:20 UTC (rev 7347)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-04-04 16:29:41 UTC (rev 7348)
@@ -108,7 +108,11 @@
fsProp.setProperty("info", "hidden=yes");
XModelObject fsJar = XModelObjectLoaderUtil.createValidObject(model, "FileSystemJar", fsProp);
if(fss.getChildByPath(fsJar.getPathPart()) == null) {
- DefaultCreateHandler.addCreatedObject(fss, fsJar, false, -1);
+ try {
+ DefaultCreateHandler.addCreatedObject(fss, fsJar, false, -1);
+ } catch (XModelException e) {
+ throw new InvocationTargetException(e);
+ }
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-04-04 16:24:20 UTC (rev 7347)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-04-04 16:29:41 UTC (rev 7348)
@@ -55,6 +55,7 @@
import org.jboss.tools.common.meta.action.SpecialWizardFactory;
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.FileSystemsHelper;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -287,7 +288,7 @@
/*
*
*/
- private void updateVersion() {
+ private void updateVersion() throws XModelException {
Bundle bundle = ModelUIPlugin.getDefault().getBundle();
String version = (String) bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
model.changeObjectAttribute(
@@ -302,7 +303,11 @@
*/
private void registerServer2(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
XModelObject fs = FileSystemsHelper.getFileSystems(model);
- model.changeObjectAttribute(fs, "application name", registry.getApplicationName());
+ try {
+ model.changeObjectAttribute(fs, "application name", registry.getApplicationName());
+ } catch (XModelException e) {
+ throw new InvocationTargetException(e);
+ }
fs.setModified(true);
model.save();
if(registry.isEnabled()) ModelPlugin.getDefault().getWorkbench().getDisplay().asyncExec(new Runnable() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2008-04-04 16:24:20 UTC (rev 7347)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2008-04-04 16:29:41 UTC (rev 7348)
@@ -30,6 +30,7 @@
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
@@ -124,7 +125,7 @@
return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"; //$NON-NLS-1$
}
- private boolean checkServletVersion() {
+ private boolean checkServletVersion() throws XModelException {
if(context.isServletVersionConsistentToWebXML()) return true;
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
String servletVersion = context.getServletVersion();
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7347 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:24:20 -0400 (Fri, 04 Apr 2008)
New Revision: 7347
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/ConnectionCommand.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/ConnectionCommand.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/ConnectionCommand.java 2008-04-04 16:24:01 UTC (rev 7346)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/ConnectionCommand.java 2008-04-04 16:24:20 UTC (rev 7347)
@@ -12,6 +12,7 @@
import org.eclipse.gef.commands.Command;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jst.web.tiles.ui.editor.edit.TilesEditPart;
import org.jboss.tools.jst.web.tiles.ui.editor.model.IDefinition;
@@ -57,9 +58,13 @@
public void execute() {
if (((IDefinition) target.getModel()).isCollapsed())
((IDefinition) target.getModel()).expand();
+ try {
((IDefinition) source.getModel()).getTilesModel().getHelper().makeLink(
(XModelObject) ((IDefinition) source.getModel()).getSource(),
(XModelObject) ((IDefinition) target.getModel()).getSource());
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
}
public String getLabel() {
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7346 - in trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model: handlers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:24:01 -0400 (Fri, 04 Apr 2008)
New Revision: 7346
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-04-04 16:23:01 UTC (rev 7345)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-04-04 16:24:01 UTC (rev 7346)
@@ -14,6 +14,7 @@
import java.io.StringWriter;
import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.filesystems.FileAuxiliary;
@@ -117,6 +118,9 @@
f.setUpdateLock();
try {
f.edit(body, true);
+ } catch (XModelException e) {
+ //TODO throw XModelException
+ throw new RuntimeException(e);
} finally {
f.releaseUpdateLock();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java 2008-04-04 16:23:01 UTC (rev 7345)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java 2008-04-04 16:24:01 UTC (rev 7346)
@@ -24,13 +24,13 @@
(entity.equals("FileJSP") || entity.startsWith("FileHTML")));
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
String entity = object.getModelEntity().getName();
if(entity.startsWith("StrutsAction")) adoptAction(target, object);
if(entity.equals("FileJSP") || entity.startsWith("FileHTML")) adoptPage(target, object);
}
- private void adoptAction(XModelObject target, XModelObject object) {
+ private void adoptAction(XModelObject target, XModelObject object) throws XModelException {
String path = object.getAttributeValue("path");
XModelObject cg = object;
while(cg != null && !cg.getModelEntity().getName().startsWith("StrutsConfig")) cg = cg.getParent();
@@ -38,7 +38,7 @@
target.getModel().changeObjectAttribute(target, "controllerUrl", path);
}
- private void adoptPage(XModelObject target, XModelObject object) {
+ private void adoptPage(XModelObject target, XModelObject object) throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(object);
if(path == null) return;
XModelObject fs = object;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java 2008-04-04 16:23:01 UTC (rev 7345)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java 2008-04-04 16:24:01 UTC (rev 7346)
@@ -91,7 +91,7 @@
return true;
}
- public void makeLink(XModelObject sourceItem, XModelObject targetItem) {
+ public void makeLink(XModelObject sourceItem, XModelObject targetItem) throws XModelException {
XModelObject sourceReference = getReference(sourceItem);
if(sourceReference == null) return;
sourceReference.getModel().editObjectAttribute(sourceReference, ATT_EXTENDS, targetItem.getAttributeValue(ATT_NAME));
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7345 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: context and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:23:01 -0400 (Fri, 04 Apr 2008)
New Revision: 7345
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.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/AbstractWebFileImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -39,7 +39,9 @@
import org.jboss.tools.common.log.IPluginLog;
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.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin;
import org.osgi.framework.BundleContext;
@@ -81,7 +83,11 @@
while(preferences.hasNext()) {
Object preference = preferences.next();
if(preference instanceof WebPreference) {
- PreferenceModelUtilities.initPreferenceValue(initialModel,(WebPreference)preference);
+ try {
+ PreferenceModelUtilities.initPreferenceValue(initialModel,(WebPreference)preference);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
}
PreferenceModelUtilities.getPreferenceModel().save();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IProject;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -35,6 +36,6 @@
public RegisterServerContext getRegisterServerContext();
public String SERVLET_VERSION_WARNING = WebUIMessages.SERVLET_VERSION_WARNING;
public boolean isServletVersionConsistentToWebXML();
- public void convertWebXML(boolean backup);
+ public void convertWebXML(boolean backup) throws XModelException;
public boolean isLinkingToProjectOutsideWorkspace();
}
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-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -266,7 +266,7 @@
return true;
}
- public void convertWebXML(boolean backup) {
+ public void convertWebXML(boolean backup) throws XModelException {
if(webxml == null) return;
String entity = webxml.getModelEntity().getName();
if("2.3".equals(servletVersion) && !entity.equals("FileWebApp")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -286,7 +286,7 @@
return WebAppHelper.getServletVersion(webxml);
}
- private void convertWebXML(String entity, boolean backup) {
+ private void convertWebXML(String entity, boolean backup) throws XModelException {
if(backup) backUp();
XModelObject newweb = XModelObjectLoaderUtil.createValidObject(webxml.getModel(), entity);
XAttribute[] as = newweb.getModelEntity().getAttributes();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -30,7 +30,7 @@
return process;
}
- protected void mergeAll(XModelObject f, boolean update) {
+ protected void mergeAll(XModelObject f, boolean update) throws XModelException {
WebProcess process = provideWebProcess();
merge(f, !update);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -12,6 +12,7 @@
import java.util.*;
import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -22,7 +23,7 @@
return isAdoptableBundle(object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(!isAcceptableTarget(target)) return;
if(isAdoptableBundle(object)) adoptBundle(target, object, p);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -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;
import org.jboss.tools.common.model.util.XModelObjectUtil;
@@ -99,7 +100,7 @@
* @param loadOnStartUp
* @return
*/
- public static XModelObject findOrCreateServlet(XModelObject webxml, String className, String servletName, int loadOnStartUp) {
+ public static XModelObject findOrCreateServlet(XModelObject webxml, String className, String servletName, int loadOnStartUp) throws XModelException {
if(webxml == null) return null;
XModelObject s = findServlet(webxml, className, servletName);
if(s == null) {
@@ -142,7 +143,7 @@
* @param value
* @return
*/
- public static XModelObject setWebAppInitParam(XModelObject servlet, String name, String value) {
+ public static XModelObject setWebAppInitParam(XModelObject servlet, String name, String value) throws XModelException {
if(servlet == null) return null;
XModelObject p = findWebAppInitParam(servlet, name);
if(p == null) {
@@ -162,7 +163,7 @@
* @param value
* @return
*/
- public static XModelObject appendToWebAppInitParam(XModelObject servlet, String name, String valuePart) {
+ public static XModelObject appendToWebAppInitParam(XModelObject servlet, String name, String valuePart) throws XModelException {
if(servlet == null) return null;
XModelObject p = findWebAppInitParam(servlet, name);
if(p == null) {
@@ -177,7 +178,7 @@
return p;
}
- private static XModelObject createWebAppInitParam(XModelObject servlet, String name, String value) {
+ private static XModelObject createWebAppInitParam(XModelObject servlet, String name, String value) throws XModelException {
if(servlet == null) return null;
XModelObject p = servlet.getModel().createModelObject("WebAppInitParam", null);
p.setAttributeValue("param-name", name);
@@ -224,7 +225,7 @@
* @param value
* @return
*/
- public static XModelObject setWebAppContextParam(XModelObject webxml, String name, String value) {
+ public static XModelObject setWebAppContextParam(XModelObject webxml, String name, String value) throws XModelException {
if(webxml == null) return null;
XModelObject p = findWebAppContextParam(webxml, name);
if(p == null) {
@@ -244,7 +245,7 @@
* @param value
* @return
*/
- public static XModelObject appendToWebAppContextParam(XModelObject webxml, String name, String valuePart) {
+ public static XModelObject appendToWebAppContextParam(XModelObject webxml, String name, String valuePart) throws XModelException {
if(webxml == null) return null;
XModelObject p = findWebAppContextParam(webxml, name);
if(p == null) {
@@ -259,7 +260,7 @@
return p;
}
- private static XModelObject createWebAppContextParam(XModelObject webxml, String name, String value) {
+ private static XModelObject createWebAppContextParam(XModelObject webxml, String name, String value) throws XModelException {
if(webxml == null) return null;
XModelObject folder = webxml.getChildByPath("Context Params");
if(folder == null) folder = webxml;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -14,6 +14,7 @@
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.meta.action.SpecialWizard;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.ClassPathUpdate;
import org.jboss.tools.jst.web.*;
@@ -27,11 +28,17 @@
}
public int execute() {
- addServletSupport();
+ try {
+ addServletSupport();
+ } catch (XModelException e) {
+ //TODO probably wizard should throw XModelException?
+ ModelPlugin.getPluginLog().logError(e);
+ return 1;
+ }
return 0;
}
- private void addServletSupport() {
+ private void addServletSupport() throws XModelException {
XModelObject web = model.getByPath("Web");
if(web == null) return;
String servletVersion = web.getAttributeValue("servlet version");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.tld.model;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.CustomizedObjectImpl;
public class TLDAttribute21Impl extends CustomizedObjectImpl {
@@ -17,7 +18,7 @@
static String DEFERRED_VALUE = "deferred-value type";
static String DEFERRED_METHOD = "deferred-method signature";
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(DEFERRED_VALUE.equals(name)) {
setAttributeValue(DEFERRED_METHOD, "");
} else if(DEFERRED_METHOD.equals(name)) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.*;
//See WebAppErrorPageImpl
@@ -32,7 +33,7 @@
return "variable:" + ((ng != null && ng.length() > 0) ? ng : na);
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(NAME_GIVEN.equals(name) && newValue != null && newValue.length() > 0) {
if(getAttributeValue(NAME_FROM_ATTRIBUTE).length() > 0) {
Properties p = new Properties();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -29,7 +29,7 @@
|| isAdoptableTaglib(object) || isAdoptableMacro(object) || isAdoptableGroup(object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(!isAcceptableTarget(target)) return;
if(isAdoptableTag(object)) adoptTag(target, object, p);
else if(isAdoptableAttribute(object)) adoptAttribute(target, object, p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -29,7 +29,7 @@
return isAdoptableTag(target, object) || isAdoptableTaglib(target, object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableTag(target, object)) adoptTag(target, object);
else if(isAdoptableTaglib(target, object)) adoptTaglib(target, object);
}
@@ -53,7 +53,7 @@
return true;
}
- public void adoptTag(XModelObject target, XModelObject object) {
+ public void adoptTag(XModelObject target, XModelObject object) throws XModelException {
if(target.getModelEntity().getName().startsWith("SharableMacro")) target = target.getParent(); //$NON-NLS-1$
add(target, object, helper.createMacroByTag(object, target.getModel()));
}
@@ -83,7 +83,7 @@
XActionInvoker.invoke("ImportTLDToPaletteWizard", "CreateActions.ImportTLD", paletteRoot, p); //$NON-NLS-1$ //$NON-NLS-2$
}
- static void add(XModelObject target, XModelObject object, XModelObject created) {
+ static void add(XModelObject target, XModelObject object, XModelObject created) throws XModelException {
if(created == null) return;
XModelObject old = target.getChildByPath(created.getPathPart());
if(old != null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -13,6 +13,7 @@
import java.io.File;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.launching.*;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.jst.web.*;
@@ -32,7 +33,7 @@
return null;
}
- public static String createVM(String path) {
+ public static String createVM(String path) throws XModelException {
String jvm = findVM(path);
if(jvm == null) {
jvm = new File(path).getName();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.*;
public class WebAppErrorPageImpl extends RegularObjectImpl {
@@ -23,7 +24,7 @@
return (code != null && code.length() > 0) ? code : getAttributeValue(WebAppConstants.EXCEPTION_TYPE);
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(WebAppConstants.ERROR_CODE.equals(name) && newValue != null && newValue.length() > 0) {
if(getAttributeValue(WebAppConstants.EXCEPTION_TYPE).length() > 0) {
Properties p = new Properties();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.webapp.model;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.*;
public class WebAppFilterMappingImpl extends RegularObjectImpl {
@@ -22,7 +23,7 @@
return getAttributeValue("filter-name") + ":" + v;
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(WebAppConstants.URL_PATTERN.equals(name) && newValue != null && newValue.length() > 0) {
setAttributeValue(WebAppConstants.SERVLET_NAME, "");
} else if(WebAppConstants.SERVLET_NAME.equals(name) && newValue != null && newValue.length() > 0) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2008-04-04 16:22:11 UTC (rev 7344)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2008-04-04 16:23:01 UTC (rev 7345)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.webapp.model;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.*;
public class WebAppServletImpl extends OrderedObjectImpl {
@@ -29,7 +30,7 @@
return "" + getAttributeValue("servlet-name") + ":" + c;
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(WebAppConstants.SERVLET_CLASS.equals(name) && newValue != null && newValue.length() > 0) {
setAttributeValue(WebAppConstants.JSP_FILE, "");
} else if(WebAppConstants.JSP_FILE.equals(name) && newValue != null && newValue.length() > 0) {
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7344 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: outline and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:22:11 -0400 (Fri, 04 Apr 2008)
New Revision: 7344
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2008-04-04 16:21:15 UTC (rev 7343)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2008-04-04 16:22:11 UTC (rev 7344)
@@ -63,6 +63,7 @@
if (activeEditor != null) {
ISelectionProvider selectionProvider = activeEditor.getSite()
.getSelectionProvider();
+ System.out.println(selectionProvider);
if (selectionProvider != null)
return selectionProvider.getSelection();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-04-04 16:21:15 UTC (rev 7343)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-04-04 16:22:11 UTC (rev 7344)
@@ -88,10 +88,12 @@
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.XModelBuffer;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory;
@@ -481,7 +483,11 @@
if (getEditorInput() instanceof ILocationProvider) {
XModelObject p = o.getParent();
if (p instanceof FolderImpl) {
- ((FolderImpl) p).saveChild(o);
+ try {
+ ((FolderImpl) p).saveChild(o);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
} else {
o.setModified(false);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2008-04-04 16:21:15 UTC (rev 7343)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2008-04-04 16:22:11 UTC (rev 7344)
@@ -20,6 +20,7 @@
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.util.TransferDropTargetListener;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.dnd.DropTargetEvent;
@@ -80,6 +81,7 @@
Transfer[] transfers = new Transfer[]{
ModelTransfer.getInstance(),
HTMLTransfer.getInstance(),
+ LocalSelectionTransfer.getTransfer(),
ObjectTransfer.getInstance(),
FileTransfer.getInstance(),
TextTransfer.getInstance()
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7343 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:21:15 -0400 (Fri, 04 Apr 2008)
New Revision: 7343
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java
Log:
JBIDE-893
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 16:20:47 UTC (rev 7342)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 16:21:15 UTC (rev 7343)
@@ -15,6 +15,7 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.source.SourceViewer;
import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jsf.project.JSFNature;
@@ -43,7 +44,7 @@
return "FilePROPERTIES".equals(object.getModelEntity().getName());
}
- public void adopt(XModelObject target, XModelObject object, Properties p) {
+ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException {
if(isAdoptableProperty(object)) adoptProperty(target, object, p);
if(isAdoptableBundle(object)) adoptBundle(target, object, p);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java 2008-04-04 16:20:47 UTC (rev 7342)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFCapabilitiesPreferencesPage.java 2008-04-04 16:21:15 UTC (rev 7343)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.ui.preferences;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.objecteditor.XChildrenEditor;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.viewers.*;
@@ -17,6 +18,7 @@
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.*;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.engines.impl.EnginesLoader;
import org.jboss.tools.common.model.util.AbstractTableHelper;
@@ -182,7 +184,11 @@
public boolean performOk() {
long ts = capabilities.getTimeStamp();
- EnginesLoader.merge(capabilities, copy);
+ try {
+ EnginesLoader.merge(capabilities, copy);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
if(ts != capabilities.getTimeStamp()) {
capabilities.setModified(ts != capabilities.getTimeStamp());
capabilities.save();
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7342 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:20:47 -0400 (Fri, 04 Apr 2008)
New Revision: 7342
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/FacesConfigAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.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/bean/RenameManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/tile/TilesFileRegistration.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ApplicationObjectImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ConverterObjectImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/EntryObjectImpl.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/web/JSFTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java
Log:
JBIDE-893
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -14,7 +14,9 @@
import org.jboss.tools.common.log.IPluginLog;
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.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -41,6 +43,7 @@
XModel initialModel = PreferenceModelUtilities.createPreferenceModel(p);
if (initialModel != null)
{
+ try {
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.USE_DEFAULT_JSF_PROJECT_ROOT);
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_VERSION);
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_PROJECT_TEMPLATE);
@@ -48,6 +51,9 @@
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_SERVLET_VERSION);
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_NEW_JSF_PROJECT_IN_SERVER);
PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_IMPORTED_JSF_PROJECT_IN_SERVER);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
PreferenceModelUtilities.getPreferenceModel().save();
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -120,6 +120,9 @@
f.setUpdateLock();
try {
f.edit(body, true);
+ } catch (XModelException e) {
+ //TODO throw XModelException
+ throw new RuntimeException(e);
} finally {
f.releaseUpdateLock();
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -97,7 +97,7 @@
return rule;
}
- protected void mergeAll(XModelObject f, boolean update) {
+ protected void mergeAll(XModelObject f, boolean update) throws XModelException {
FacesProcessImpl process = (FacesProcessImpl)provideWebProcess();
boolean b = (process != null && process.isPrepared);
if(b) process.getHelper().addUpdateLock(this);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/FacesConfigAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/FacesConfigAdopt.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/FacesConfigAdopt.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -12,6 +12,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -24,7 +25,7 @@
return false;
}
- public void adopt(XModelObject target, XModelObject object, Properties p) {
+ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException {
if(jspAdopt.isAdoptablePage(object)) adoptPage(target, object, p);
else if(isAdoptableBundle(object)) adoptBundle(target, object, p);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -67,7 +67,7 @@
return (case_ != null && rule == null || rule != case_.getParent());
}
- public void adopt(XModelObject target, XModelObject object, Properties p) {
+ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException {
String entity = object.getModelEntity().getName();
if(ENT_PROCESS_ITEM_OUTPUT.equals(entity)) {
if(move_case) {
@@ -82,21 +82,21 @@
else if(ENT_NAVIGATION_CASE.equals(entity)) adoptCase(object, target, p);
}
- protected void adoptOutput(XModelObject source, XModelObject target, Properties p) {
+ protected void adoptOutput(XModelObject source, XModelObject target, Properties p) throws XModelException {
ReferenceObjectImpl i = (ReferenceObjectImpl)source;
adoptCase(i.getReference(), target, p);
}
- protected void adoptCase(XModelObject source, XModelObject target, Properties p) {
+ protected void adoptCase(XModelObject source, XModelObject target, Properties p) throws XModelException {
source.getModel().changeObjectAttribute(source, ATT_TO_VIEW_ID, target.getAttributeValue(ATT_PATH));
}
- protected void adoptItem(XModelObject source, XModelObject target, Properties p) {
+ protected void adoptItem(XModelObject source, XModelObject target, Properties p) throws XModelException {
ReferenceObjectImpl i = (ReferenceObjectImpl)source;
adoptRule(i.getReference(), target, p);
}
- protected void adoptRule(XModelObject source, XModelObject target, Properties p) {
+ protected void adoptRule(XModelObject source, XModelObject target, Properties p) throws XModelException {
String path = target.getAttributeValue(ATT_PATH);
String n = path;
if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.'));
@@ -110,7 +110,7 @@
DefaultCreateHandler.addCreatedObject(source, cs, p);
}
- protected void adoptGroup(XModelObject source, XModelObject target, Properties p) {
+ protected void adoptGroup(XModelObject source, XModelObject target, Properties p) throws XModelException {
ReferenceGroupImpl g = (ReferenceGroupImpl)source;
XModelObject[] os = g.getReferences();
if(os != null && os.length > 0) {
@@ -134,12 +134,12 @@
}
}
- void moveOutput(XModelObject source, XModelObject target, Properties p) {
+ void moveOutput(XModelObject source, XModelObject target, Properties p) throws XModelException {
ReferenceObjectImpl i = (ReferenceObjectImpl)source;
moveCase(i.getReference(), target, p);
}
- void moveCase(XModelObject source, XModelObject target, Properties p) {
+ void moveCase(XModelObject source, XModelObject target, Properties p) throws XModelException {
XModelObject rule = null;
if(target instanceof ReferenceGroupImpl) {
rule = ((ReferenceGroupImpl)target).getReference();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -36,7 +36,7 @@
isAdoptableMapEntry(object);
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableProperty(object)) adoptProperty(target, object, p);
else if(isAdoptablePropertyReference(object)) adoptPropertyReference(target, object, p);
else if(isAdoptablePage(object)) adoptPage(target, object, p);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.meta.XAdoptManager;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jsf.JSFPreference;
@@ -22,7 +23,7 @@
public class ProcessAdopt implements XAdoptManager, JSFConstants {
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
if(isAdoptableJSP(target, object)) {
adoptJSP(target, object, p);
} else if(isAdoptableItem(target, object)) {
@@ -53,7 +54,7 @@
return false;
}
- private void adoptJSP(XModelObject target, XModelObject object, Properties p) {
+ private void adoptJSP(XModelObject target, XModelObject object, Properties p) throws XModelException {
if (target.getModelEntity().getName().startsWith(ENT_FACESCONFIG)) {
target = target.getChildByPath(ELM_PROCESS);
}
@@ -66,7 +67,7 @@
*/
}
- private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p) {
+ private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p) throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(page);
XModelObject group = JSFProcessHelper.getHelper(process).getPage(path);
if(group != null) return;
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-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -110,7 +110,7 @@
return true;
}
- public static void replace(ReferenceGroupImpl group, String oldPath, String newPath) {
+ public static void replace(ReferenceGroupImpl group, String oldPath, String newPath) throws XModelException {
String pp = NavigationRuleObjectImpl.toNavigationRulePathPart(newPath);
boolean isPattern = JSFProcessHelper.isPattern(newPath);
XModel model = group.getModel();
@@ -184,7 +184,7 @@
* the item will be extracted from this group and added to the other,
* or new group will be created.
*/
- private void extract(String oldPath, String newPath) {
+ private void extract(String oldPath, String newPath) throws XModelException {
String pp = NavigationRuleObjectImpl.toNavigationRulePathPart(newPath);
// boolean isPattern = JSFProcessHelper.isPattern(newPath);
XModel model = group.getModel();
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-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -88,7 +88,7 @@
}
- private void renameClass(XModelObject object, String qualifiedName) {
+ private void renameClass(XModelObject object, String qualifiedName) throws XModelException {
object.getModel().changeObjectAttribute(object, "managed-bean-class", qualifiedName);
}
@@ -112,7 +112,11 @@
String className = toElement.getElementName();
if(className.endsWith(".java")) className = className.substring(0, className.length() - 5);
if(packageName.length() > 0) className = packageName + "." + className;
- renameClass(object, className);
+ try {
+ renameClass(object, className);
+ } catch (XModelException e) {
+ throw new RuntimeException(e);
+ }
}
} finally {
JavaCore.removeElementChangedListener(this);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -19,6 +19,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.jsf.messages.JSFUIMessages;
@@ -97,7 +98,7 @@
return null;
}
- private void performChangeInFile(XModelObject f) {
+ private void performChangeInFile(XModelObject f) throws XModelException {
XModelObject[] gs = findGroups(f);
if(gs.length == 0) return;
JSFProcessHelper h = JSFProcessHelper.getHelper(JSFProcessStructureHelper.instance.getProcess(f));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -18,6 +18,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -100,7 +101,7 @@
return null;
}
- private void performChangeInFile(XModelObject f) {
+ private void performChangeInFile(XModelObject f) throws XModelException {
replaceIcons(f, oldText, newText);
XModelObject[] gs = findGroups(f);
if(gs.length == 0) return;
@@ -130,7 +131,7 @@
static String[] ICON_ATTRIBUTES = {"small-icon", "large-icon"};
- static void replaceIcons(XModelObject f, String oldText, String newText) {
+ static void replaceIcons(XModelObject f, String oldText, String newText) throws XModelException {
if(oldText == null || oldText.length() == 0) return;
if(f.getModelEntity().getAttribute(ICON_ATTRIBUTES[0]) != null) {
for (int i = 0; i < ICON_ATTRIBUTES.length; i++) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/tile/TilesFileRegistration.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/tile/TilesFileRegistration.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/tile/TilesFileRegistration.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -14,7 +14,9 @@
import org.jboss.tools.common.meta.action.SpecialWizard;
import org.jboss.tools.common.meta.action.XActionInvoker;
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.plugin.ModelPlugin;
import org.jboss.tools.jsf.model.pv.JSFProjectTiles;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -37,6 +39,16 @@
public int execute() {
if(webxml == null) return 1;
+ try {
+ return doExecute();
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ if(p != null) p.put("exception", e);
+ return 1;
+ }
+ }
+
+ private int doExecute() throws XModelException {
if(test) {
return test();
} else if(path == null && oldPath != null) {
@@ -52,7 +64,7 @@
return 0;
}
- void append() {
+ void append() throws XModelException {
XModelObject context = WebAppHelper.findWebAppContextParam(webxml, JSFProjectTiles.TILES_DEFINITIONS_2);
if(context != null) {
WebAppHelper.appendToWebAppContextParam(webxml, JSFProjectTiles.TILES_DEFINITIONS_2, path);
@@ -62,7 +74,7 @@
}
}
- void replace() {
+ void replace() throws XModelException {
XModelObject context = WebAppHelper.findWebAppContextParam(webxml, JSFProjectTiles.TILES_DEFINITIONS_2);
String[] s = null;
XModelObject servlet = null;
@@ -99,7 +111,7 @@
p.setProperty("success", "true");
}
- int test() {
+ int test() throws XModelException {
if(path == null) return 1;
XModelObject context = WebAppHelper.findWebAppContextParam(webxml, JSFProjectTiles.TILES_DEFINITIONS_2);
String[] s = null;
@@ -118,7 +130,7 @@
return 1;
}
- void remove() {
+ void remove() throws XModelException {
replace();
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ApplicationObjectImpl.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ApplicationObjectImpl.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ApplicationObjectImpl.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -13,6 +13,7 @@
import java.util.Properties;
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.impl.*;
@@ -53,7 +54,7 @@
return super.setAttributeValue(name, value);
}
- public void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ public void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(name != null && ATTR_TO_ENTITY.containsKey(name)) {
String entity = ATTR_TO_ENTITY.getProperty(name);
XModelObject[] cs = getChildren(entity);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ConverterObjectImpl.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ConverterObjectImpl.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/ConverterObjectImpl.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.model.impl;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.OrderedByEntityChildren;
import org.jboss.tools.common.model.impl.OrderedObjectImpl;
import org.jboss.tools.common.model.impl.RegularChildren;
@@ -37,7 +38,7 @@
return "" + getAttributeValue("converter-class");
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if("converter-id".equals(name) && newValue != null && newValue.length() > 0) {
setAttributeValue("converter-for-class", "");
} else if("converter-for-class".equals(name) && newValue != null && newValue.length() > 0) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/EntryObjectImpl.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/EntryObjectImpl.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/EntryObjectImpl.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.model.impl;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.impl.RegularObjectImpl;
public class EntryObjectImpl extends RegularObjectImpl {
@@ -29,7 +30,7 @@
String cachedValue = null;
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if("null-value".equals(name)) {
if("true".equals(newValue)) {
cachedValue = getAttributeValue("value");
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-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -20,7 +20,6 @@
import org.jboss.tools.common.model.loaders.impl.SerializingLoader;
import org.jboss.tools.common.model.util.*;
import org.jboss.tools.common.xml.*;
-import org.jboss.tools.common.xml.XMLEntityResolver;
import org.jboss.tools.jsf.messages.JSFUIMessages;
public class FileAdditionPerformer extends PerformerItem {
@@ -186,7 +185,7 @@
}
}
- private void mergeAttributes(XModelObject object, XModelObject update) {
+ private void mergeAttributes(XModelObject object, XModelObject update) throws XModelException {
XAttribute[] as = update.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String xml = as[i].getXMLName();
@@ -197,7 +196,7 @@
}
}
- private void mergeChildren(XModelObject object, XModelObject[] update) {
+ private void mergeChildren(XModelObject object, XModelObject[] update) throws XModelException {
for (int i = 0; i < update.length; i++) {
String pp = update[i].getPathPart();
XModelObject c = object.getChildByPath(pp);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFTemplate.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFTemplate.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.web;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.jsf.JSFPreference;
import org.jboss.tools.jst.web.project.helpers.*;
import org.jboss.tools.jst.web.project.version.*;
@@ -44,7 +46,11 @@
}
public void setDefaultTemplate(String template) {
- JSFPreference.DEFAULT_JSF_PROJECT_TEMPLATE.setValue(template);
+ try {
+ JSFPreference.DEFAULT_JSF_PROJECT_TEMPLATE.setValue(template);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
public String getDefaultPageTemplate() {
@@ -53,7 +59,11 @@
}
public void setDefaultPageTemplate(String template) {
- JSFPreference.DEFAULT_JSF_PAGE_TEMPLATE.setValue(template);
+ try {
+ JSFPreference.DEFAULT_JSF_PAGE_TEMPLATE.setValue(template);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
protected String getWizardEntitySuffix() {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java 2008-04-04 16:20:03 UTC (rev 7341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java 2008-04-04 16:20:47 UTC (rev 7342)
@@ -47,7 +47,7 @@
return getConfigFilesListAsString(webxml, FACES_CONFIG_DATA);
}
- public static void registerFacesConfig(XModel model, String path) {
+ public static void registerFacesConfig(XModel model, String path) throws XModelException {
registerConfigFile(model, path, FACES_CONFIG_DATA);
}
@@ -55,7 +55,7 @@
return isConfigFileRegistered(model, path, FACES_CONFIG_DATA);
}
- public static void unregisterFacesConfig(XModel model, String path) {
+ public static void unregisterFacesConfig(XModel model, String path) throws XModelException {
unregisterConfigFile(model, path, FACES_CONFIG_DATA);
}
@@ -67,7 +67,7 @@
return WebAppHelper.findWebAppContextParam(webxml, name);
}
- public static void registerFacesConfigRename(XModel model, String oldConfigName, String newConfigName, String path) {
+ public static void registerFacesConfigRename(XModel model, String oldConfigName, String newConfigName, String path) throws XModelException {
registerConfigFileRename(model, oldConfigName, newConfigName, path, FACES_CONFIG_DATA);
}
@@ -144,7 +144,7 @@
}
}
- public static void registerConfigFile(XModel model, String path, ConfigFilesData data) {
+ public static void registerConfigFile(XModel model, String path, ConfigFilesData data) throws XModelException {
XModelObject webxml = getWebConfig(model);
if(webxml == null) return;
XModelObject p = findInitParam(webxml, data.param);
@@ -188,7 +188,7 @@
return false;
}
- public static void unregisterConfigFile(XModel model, String path, ConfigFilesData data) {
+ public static void unregisterConfigFile(XModel model, String path, ConfigFilesData data) throws XModelException {
XModelObject webxml = getWebConfig(model);
if(webxml == null) return;
XModelObject p = findInitParam(webxml, data.param);
@@ -203,7 +203,7 @@
model.changeObjectAttribute(p, PARAM_VALUE, sb.toString());
}
- public static void registerConfigFileRename(XModel model, String oldConfigName, String newConfigName, String path, ConfigFilesData data) {
+ public static void registerConfigFileRename(XModel model, String oldConfigName, String newConfigName, String path, ConfigFilesData data) throws XModelException {
XModelObject webxml = getWebConfig(model);
if(webxml == null || "yes".equals(webxml.get("isIncorrect"))) return;
XModelObject p = findInitParam(webxml, data.param);
17 years, 8 months
- 1
- 0