JBoss Tools SVN: r7341 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model: helpers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:20:03 -0400 (Fri, 04 Apr 2008)
New Revision: 7341
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java
Log:
JBIDE-893
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2008-04-04 16:19:31 UTC (rev 7340)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2008-04-04 16:20:03 UTC (rev 7341)
@@ -16,6 +16,7 @@
import org.jboss.tools.common.meta.XChild;
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class FolderOwnerAdopt implements XAdoptManager {
@@ -25,7 +26,7 @@
return false;
}
- public void adopt(XModelObject target, XModelObject object, Properties p) {
+ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException {
if(isAdoptableGrandChild(target, object)) {
XModelObject folder = getFolderForChild(target, object);
if(folder == null) return;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2008-04-04 16:19:31 UTC (rev 7340)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2008-04-04 16:20:03 UTC (rev 7341)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class ColumnsStructureHelper {
@@ -126,7 +127,7 @@
return c;
}
- public static void mergeColumnDataToAttribute(XModelObject attribute, XModelObject column) {
+ public static void mergeColumnDataToAttribute(XModelObject attribute, XModelObject column) throws XModelException {
if(column == null || attribute == null) return;
if(column.isActive() && attribute.isActive()) column = column.copy();
XAttribute[] as = column.getModelEntity().getAttributes();
@@ -180,12 +181,12 @@
// return dc;
// }
- public static void replaceColumnDeclarationWithChild(XModelObject attrReference, Properties p) {
+ public static void replaceColumnDeclarationWithChild(XModelObject attrReference, Properties p) throws XModelException {
XModelObject c = newColumn(attrReference.getModel(), p);
replaceColumnDeclarationWithChild(attrReference, c);
}
- public static void replaceColumnDeclarationWithChild(XModelObject attrReference, XModelObject column) {
+ public static void replaceColumnDeclarationWithChild(XModelObject attrReference, XModelObject column) throws XModelException {
DefaultCreateHandler.addCreatedObject(attrReference, column, -1);
XModelObject c = newColumn(attrReference.getModel(), attrReference.getAttributeValue("name"));
mergeColumnDataToAttribute(attrReference, c);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2008-04-04 16:19:31 UTC (rev 7340)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2008-04-04 16:20:03 UTC (rev 7341)
@@ -14,6 +14,7 @@
import java.util.Properties;
import java.util.Set;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -128,7 +129,7 @@
return result;
}
- public static void mergeAttributes(XModelObject destination, XModelObject source) {
+ public static void mergeAttributes(XModelObject destination, XModelObject source) throws XModelException {
XModelObjectLoaderUtil.mergeAttributes(destination, source);
if (destination.getModelEntity().getAttribute("type") != null &&
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2008-04-04 16:19:31 UTC (rev 7340)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2008-04-04 16:20:03 UTC (rev 7341)
@@ -15,6 +15,7 @@
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.engines.impl.EnginesLoader;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -71,7 +72,7 @@
}
}
- public static XModelObject[] getAsAttributes(XModelObject id) {
+ public static XModelObject[] getAsAttributes(XModelObject id) throws XModelException {
String name = id.getAttributeValue("name");
if(name.length() == 0) return new XModelObject[0];
String entity = id.getModelEntity().getName();
@@ -104,7 +105,7 @@
return new XModelObject[0];
}
- public static XModelObject getAsAttribute(XModelObject key) {
+ public static XModelObject getAsAttribute(XModelObject key) throws XModelException {
String ec = key.getModelEntity().getName();
String er = ("HibernateKeyProperty".equals(ec)) ? "HibernateProperty"
: ("HibernateKeyManyToOne".equals(ec)) ? "HibernateManyToOne"
@@ -115,7 +116,7 @@
return a;
}
- public static List getAsColumns(XModelObject id) {
+ public static List getAsColumns(XModelObject id) throws XModelException {
List<XModelObject> list = new ArrayList<XModelObject>();
// String name = id.getAttributeValue("name");
// if(name.length() == 0) return list;
@@ -132,7 +133,7 @@
return list;
}
- private static void addColumnsToList(XModelObject o, List<XModelObject> list) {
+ private static void addColumnsToList(XModelObject o, List<XModelObject> list) throws XModelException {
XModelObject[] cs = o.getChildren("HibernateColumn");
if(cs.length > 0) {
for (int i = 0; i < cs.length; i++) list.add(cs[i].copy());
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2008-04-04 16:19:31 UTC (rev 7340)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2008-04-04 16:20:03 UTC (rev 7341)
@@ -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.XModelObject;
public class HibernateMapImpl extends OrderedObject2Impl {
@@ -38,7 +39,7 @@
return super.setAttributeValue(name, value);
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(newValue == null || newValue.equals(oldValue)) return;
if("index".equals(name)) {
String actionName =
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7340 - trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:19:31 -0400 (Fri, 04 Apr 2008)
New Revision: 7340
Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2008-04-04 16:19:11 UTC (rev 7339)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2008-04-04 16:19:31 UTC (rev 7340)
@@ -86,7 +86,7 @@
}
}
- protected void mergeRules(XModelObject object, XModelObject update) {
+ protected void mergeRules(XModelObject object, XModelObject update) throws XModelException {
org.jboss.tools.common.meta.XAttribute[] as = object.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7339 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/attribute and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:19:11 -0400 (Fri, 04 Apr 2008)
New Revision: 7339
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/Note2Adapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XAttributeInfo.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XCellModifier.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogOption.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -49,6 +49,7 @@
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
@@ -363,7 +364,11 @@
}
this.enableSanityChecking(false);
- f.saveChild(o);
+ try {
+ f.saveChild(o);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
this.updateModificationStamp(this.getEditorInput());
this.enableSanityChecking(true);
@@ -759,7 +764,11 @@
fModificationStamp= f.lastModified();
long stamp= f.lastModified();
+ try {
handleEditorInputChanged();
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
if (stamp != fModificationStamp) {
fModificationStamp= stamp;
// handleEditorInputChanged();
@@ -780,7 +789,7 @@
}
}
- private void handleEditorInputChanged() {
+ private void handleEditorInputChanged() throws XModelException {
XModelObject o = getModelObject();
if(o == null) return;
if(input instanceof IFileEditorInput && o.getParent() instanceof FolderImpl) {
@@ -1228,7 +1237,7 @@
return false;
}
- private void showWarning() {
+ private void showWarning() throws XModelException {
boolean isShowingWarning = "yes".equals(Preference.SHOW_NATURE_WARNING.getValue());
if(!isShowingWarning) return;
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
@@ -1281,7 +1290,7 @@
super(text);
}
- public void run() {
+ public void run() throws XModelException {
Preference.SHOW_NATURE_WARNING.setValue("no");
}
}
@@ -1344,7 +1353,7 @@
return super.register(p, k);
}
- public void run() {
+ public void run() throws XModelException {
Bundle bundle = Platform.getBundle(plugin);
if(bundle == null) return;
IActionDelegate delegate = null;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -17,6 +17,7 @@
import org.eclipse.ui.views.properties.*;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.adapter.IModelObjectAdapter;
import org.jboss.tools.common.model.event.*;
@@ -62,7 +63,11 @@
String defaultValue = modelObject.getModelEntity().getAttribute(n).getDefaultValue();
if(defaultValue == null) return;
if(modelObject.isActive()) {
- modelObject.getModel().editObjectAttribute(modelObject, n, defaultValue.toString());
+ try {
+ modelObject.getModel().editObjectAttribute(modelObject, n, defaultValue.toString());
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
} else {
modelObject.setAttributeValue(n, defaultValue.toString());
}
@@ -79,7 +84,11 @@
if(value.equals(v)) return;
cachedValues.setProperty(n, "" + value);
if(modelObject.isActive()) {
- modelObject.getModel().editObjectAttribute(modelObject, n, value.toString());
+ try {
+ modelObject.getModel().editObjectAttribute(modelObject, n, value.toString());
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
} else {
modelObject.setAttributeValue(n, value.toString());
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -23,6 +23,7 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.action.XAttributeData;
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.markers.XMarkerManager;
@@ -53,7 +54,11 @@
if(v != null && attribute.isTrimmable()) v = v.trim();
String n = attribute.getName();
if(modelObject.isActive()) {
- modelObject.getModel().editObjectAttribute(modelObject, n, v);
+ try {
+ modelObject.getModel().editObjectAttribute(modelObject, n, v);
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
} else {
modelObject.setAttributeValue(attribute.getName(), getValue().toString());
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/Note2Adapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/Note2Adapter.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/Note2Adapter.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -16,6 +16,7 @@
import org.eclipse.swt.widgets.*;
import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class Note2Adapter extends DefaultValueAdapter implements IActionHelper {
@@ -44,7 +45,11 @@
String v = encode(getValue().toString());
String n = attribute.getName();
if(modelObject.isActive()) {
- modelObject.getModel().editObjectAttribute(modelObject, n, v);
+ try {
+ modelObject.getModel().editObjectAttribute(modelObject, n, v);
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
} else {
modelObject.setAttributeValue(attribute.getName(), getValue().toString());
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -27,6 +27,8 @@
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.reporting.ProblemReporter;
import org.jboss.tools.common.model.ui.reporting.ReportPreference;
@@ -167,8 +169,12 @@
protected void okPressed() {
if(getAwayButton.getSelection()) {
- ReportPreference.SHOW_ERROR_DIALOG_OPTION.setValue("no");
- ReportPreference.SUBMIT_AUTOMATICALLY_OPTION.setValue("yes");
+ try {
+ ReportPreference.SHOW_ERROR_DIALOG_OPTION.setValue("no");
+ ReportPreference.SUBMIT_AUTOMATICALLY_OPTION.setValue("yes");
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
super.okPressed();
submit();
@@ -176,7 +182,11 @@
protected void cancelPressed() {
if(getAwayButton.getSelection()) {
- ReportPreference.SHOW_ERROR_DIALOG_OPTION.setValue("no");
+ try {
+ ReportPreference.SHOW_ERROR_DIALOG_OPTION.setValue("no");
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
}
super.cancelPressed();
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -29,6 +29,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.impl.AnyElementObjectImpl;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
@@ -226,12 +227,16 @@
String oldValue = tableProvider.getValueAt(r, c);
if(oldValue != null && oldValue.equals(value)) return;
tableProvider.attributes[r][c] = "" + value;
- commitAttributes();
+ try {
+ commitAttributes();
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e);
+ }
}
}
- void commitAttributes() {
+ void commitAttributes() throws XModelException {
if(xmo == null || tableProvider == null || tableProvider.attributes == null) return;
StringBuffer sb = new StringBuffer();
for (int i = 0; i < tableProvider.attributes.length; i++) {
@@ -252,7 +257,11 @@
} else if(XChildrenEditor.EDIT.equals(command)) {
edit();
} else if(XChildrenEditor.DELETE.equals(command)) {
- delete();
+ try {
+ delete();
+ } catch (XModelException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
}
}
}
@@ -290,7 +299,7 @@
}
}
- void delete() {
+ void delete() throws XModelException {
if(tableEditor.getTable() == null || tableEditor.getTable().isDisposed()) return;
int[] is = tableEditor.getTable().getSelectionIndices();
if(is == null || is.length == 0) return;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XAttributeInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XAttributeInfo.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XAttributeInfo.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -50,7 +50,7 @@
this.value = value;
}
- public void commit() {
+ public void commit() throws XModelException {
if(propertyEditor != null && propertyEditor.getInput() instanceof IModelPropertyEditorAdapter) {
IModelPropertyEditorAdapter adapter = (IModelPropertyEditorAdapter)propertyEditor.getInput();
adapter.setValue(this.value);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XCellModifier.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XCellModifier.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XCellModifier.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -12,6 +12,7 @@
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.swt.widgets.*;
+import org.jboss.tools.common.model.XModelException;
public class XCellModifier implements ICellModifier {
@@ -27,7 +28,13 @@
public void modify(Object element, String property, Object value) {
XAttributeInfo v = (XAttributeInfo)value;
- if(v != null) v.commit();
+ if(v != null) {
+ try {
+ v.commit();
+ } catch (XModelException e) {
+ throw new IllegalArgumentException(e.getMessage(), e);
+ }
+ }
TableItem item = (TableItem)element;
if (item!=null && !item.isDisposed()) {
item.setText(1, XTable.toVisualValue(v.getValue()));
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -47,6 +47,7 @@
import org.eclipse.ui.texteditor.RevertToSavedAction;
import org.eclipse.ui.texteditor.SaveAction;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
@@ -145,7 +146,11 @@
XModelObject o = getModelObject();
XModelObject f = o == null ? null : o.getParent();
if(f instanceof FolderImpl) {
- ((FolderImpl)f).saveChild(o);
+ try {
+ ((FolderImpl)f).saveChild(o);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
} else {
//
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogOption.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogOption.java 2008-04-04 16:18:29 UTC (rev 7338)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogOption.java 2008-04-04 16:19:11 UTC (rev 7339)
@@ -12,6 +12,7 @@
import java.util.Properties;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
public class ServiceDialogOption {
protected String text;
@@ -38,7 +39,7 @@
return Boolean.TRUE.equals(p.get(property));
}
- public void run() {
+ public void run() throws XModelException {
}
}
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7338 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: meta/action/impl and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:18:29 -0400 (Fri, 04 Apr 2008)
New Revision: 7338
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XAdoptManager.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -10,10 +10,11 @@
******************************************************************************/
package org.jboss.tools.common.meta;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public interface XAdoptManager {
public boolean isAdoptable(XModelObject target, XModelObject object);
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p);
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/CompoundAdoptManager.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -37,8 +37,10 @@
array[length] = m;
length++;
}
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelPlugin.getDefault().getLog().log(new Status(Status.ERROR, ModelPlugin.PLUGIN_ID, Status.OK, "Model warning: Cannot load class " + cls + ".", e));
+ } catch (ClassCastException e2) {
+ ModelPlugin.getDefault().getLog().log(new Status(Status.ERROR, ModelPlugin.PLUGIN_ID, Status.OK, "Model warning: Cannot load class " + cls + ".", e2));
}
}
if(length < array.length) {
@@ -58,7 +60,7 @@
return false;
}
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p) {
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException {
XAdoptManager[] ms = getManagers();
for (int i = 0; i < ms.length; i++) {
if(ms[i].isAdoptable(target, object)) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -77,6 +77,7 @@
return p;
}
+ //TODO throw XModelException
public static String extractProperty(XAttributeData ad) {
XAttribute a = ad.getAttribute();
String pn = a.getName();
@@ -135,7 +136,7 @@
return (object != null && object.isObjectEditable());
}
- public static void addCreatedObject(XModelObject parent, XModelObject child, Properties whereSelect) {
+ public static void addCreatedObject(XModelObject parent, XModelObject child, Properties whereSelect) throws XModelException {
addCreatedObject(parent, child, true, whereSelect);
}
@@ -155,21 +156,21 @@
return null;
}
- public static void addCreatedObject(XModelObject parent, XModelObject child, boolean registerundo, Properties whereSelect) {
+ public static void addCreatedObject(XModelObject parent, XModelObject child, boolean registerundo, Properties whereSelect) throws XModelException {
addCreatedObject(parent, child, registerundo, extractWhereSelect(whereSelect));
}
- public static void addCreatedObject(XModelObject parent, XModelObject child, int whereSelect) {
+ public static void addCreatedObject(XModelObject parent, XModelObject child, int whereSelect) throws XModelException {
addCreatedObject(parent, child, true, whereSelect);
}
- public static void addCreatedObject(XModelObject parent, final XModelObject child, boolean registerundo, final int whereSelect) {
- if(child == null) throw new RuntimeException(getMessageById("OBJECT_CREATION_FAILURE"));
+ public static void addCreatedObject(XModelObject parent, final XModelObject child, boolean registerundo, final int whereSelect) throws XModelException {
+ if(child == null) throw new XModelException(getMessageById("OBJECT_CREATION_FAILURE"));
String mes = getContainsMessage(parent, child);
- if(mes != null) throw new RuntimeException(mes);
+ if(mes != null) throw new XModelException(mes);
String ce = child.getModelEntity().getName();
XChild c = parent.getModelEntity().getChild(ce);
- if(c == null) throw new RuntimeException(getMessageById("OBJECT_ADDING_FAILURE"));
+ if(c == null) throw new XModelException(getMessageById("OBJECT_ADDING_FAILURE"));
int max = c.getMaxCount();
int cur = parent.getChildren(ce).length;
if(cur >= max) {
@@ -194,7 +195,7 @@
b = parent.addChild(child);
}
if(!b) {
- throw new RuntimeException(getMessageById("OBJECT_ADDING_FAILURE"));
+ throw new XModelException(getMessageById("OBJECT_ADDING_FAILURE"));
}
XUndoManager undo = getUndoManager(parent);
if(registerundo && undo != null) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultEditHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -56,13 +56,13 @@
if(stamp == object.getTimeStamp()) undo.rollbackTransactionInProgress();
} catch (Exception e) {
undo.rollbackTransactionInProgress();
- throw new XModelException(e);
+ XModelException.rethrow(e);
} finally {
u.commit();
}
}
- public static void edit(XModelObject object, Properties p) {
+ public static void edit(XModelObject object, Properties p) throws XModelException {
XModelEntity e = object.getModelEntity();
Enumeration en = p.keys();
boolean active = object.isActive();
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithChoiceHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -63,7 +63,7 @@
return es.length > 0;
}
- static void changeDefaultEditor(XModel model, String ext, String editor) {
+ static void changeDefaultEditor(XModel model, String ext, String editor) throws XModelException {
XModelObject o = model.getByPath(OpenWithHelper.EDITORS);
StringBuffer sb = new StringBuffer();
String ov = o.getAttributeValue("extensions");
@@ -81,7 +81,7 @@
applyChange(o, ov, sb.toString());
}
- static void removeDefaultEditor(XModel model, String ext) {
+ static void removeDefaultEditor(XModel model, String ext) throws XModelException {
XModelObject o = model.getByPath(OpenWithHelper.EDITORS);
StringBuffer sb = new StringBuffer();
String ov = o.getAttributeValue("extensions");
@@ -99,7 +99,7 @@
sb.append(item);
}
- private static void applyChange(XModelObject editors, String ov, String nv) {
+ private static void applyChange(XModelObject editors, String ov, String nv) throws XModelException {
if(nv.equals(ov)) return;
editors.getModel().changeObjectAttribute(editors, "extensions", nv);
editors.getModel().saveOptions();
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -42,7 +42,7 @@
start(action.getDisplayName(), f, editor);
}
- static boolean checkSave(String actionname, XModelObject object) {
+ static boolean checkSave(String actionname, XModelObject object) throws XModelException {
if(!object.isModified() || !object.isActive() || !(object.getParent() instanceof FolderImpl)) return true;
ServiceDialog d = object.getModel().getService();
String mes = DefaultCreateHandler.title(object, true) + " is modified.\n" +
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithHelper.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -65,7 +65,7 @@
return res;
}
- static boolean validatePath(String actionname, XModelObject o) {
+ static boolean validatePath(String actionname, XModelObject o) throws XModelException {
String[] paths = getEnvironmentPaths();
XModel model = o.getModel();
String en = o.getModelEntity().getName();
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -83,7 +83,7 @@
}
}
- protected final void paste(XModelObject parent, int sourceIndex, Properties p) {
+ protected final void paste(XModelObject parent, int sourceIndex, Properties p) throws XModelException {
XModelObject source = getBuffer(parent).source(sourceIndex);
XModelObject copy = getBuffer(parent).copy(sourceIndex);
XModelObject existing = parent.getChildByPath(copy.getPathPart());
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -433,7 +433,7 @@
this.entity = entity;
}
- public void adopt(XModelObject target, XModelObject object, Properties p) {
+ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException {
validate();
if(entity.adopt != null) {
entity.adopt.adopt(target, object, p);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -124,7 +124,7 @@
* @param attributeName
* @param newValue
*/
- public void changeObjectAttribute(XModelObject object, String attributeName, String newValue);
+ public void changeObjectAttribute(XModelObject object, String attributeName, String newValue) throws XModelException;
/**
* Does the same as method changeObjectAttribute, but also
@@ -138,7 +138,7 @@
* @param attributeName
* @param newValue
*/
- public void editObjectAttribute(XModelObject object, String attributeName, String newValue);
+ public void editObjectAttribute(XModelObject object, String attributeName, String newValue) throws XModelException;
/**
* Returns undo manager that keeps multi-changes transaction
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -60,7 +60,12 @@
if(!object.getModel().getFileRegistry().isUpdated(f)) return true;
XModelObject c = object.copy(0);
load(c);
- merge(object, c);
+ try {
+ merge(object, c);
+ } catch (XModelException e) {
+ //TODO this method should throw XModelException
+ throw new RuntimeException(e);
+ }
return true;
}
@@ -72,11 +77,11 @@
return object.getModelEntity().getName().toLowerCase() + ".rex";
}
- public static void merge(XModelObject object, XModelObject update) {
+ public static void merge(XModelObject object, XModelObject update) throws XModelException {
merge(object, update, object.isActive());
}
- public static void merge(XModelObject object, XModelObject update, boolean fire) {
+ public static void merge(XModelObject object, XModelObject update, boolean fire) throws XModelException {
XModelObjectLoaderUtil.mergeAttributes(object, update, fire);
Map<String,XModelObject> map = getChildrenForSaveAsMap(object);
Set<String> set = null;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -208,7 +208,7 @@
});
}
- XModelObject createFile(XModelObject fs, String path, String body, Properties p) {
+ XModelObject createFile(XModelObject fs, String path, String body, Properties p) throws XModelException {
StringTokenizer st = new StringTokenizer(path, "/");
int c = st.countTokens(), i = 0;
while(i < c - 1) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -140,7 +140,7 @@
return get("body");
}
- public void edit(String body) {
+ public void edit(String body) throws XModelException {
edit(body, false);
}
@@ -148,7 +148,7 @@
return "true".equals(get("forceLoad"));
}
- public void edit(String body, boolean update) {
+ public void edit(String body, boolean update) throws XModelException {
if(body == null) return;
if(!isForceLoadOn() && body.equals(getAsText())) return;
@@ -212,8 +212,8 @@
changeTimeStamp();
if(b) set("actualBodyTimeStamp", "" + getTimeStamp());
}
- protected void mergeAll(XModelObject f, boolean update) {
- merge(f, !update);
+ protected void mergeAll(XModelObject f, boolean update) throws XModelException {
+ merge(f, !update);
}
protected boolean isMergingChanges() {
@@ -255,7 +255,7 @@
return f;
}
- protected final void merge(XModelObject update, boolean fire) {
+ protected final void merge(XModelObject update, boolean fire) throws XModelException {
if(!"yes".equals(update.get("isIncorrect"))) {
super.set("incorrectBody", "");
super.set("isIncorrect","no");
@@ -307,7 +307,7 @@
}
static String NO_MERGE_ATTRIBUTES = ".name.extension._lateload.isIncorrect.incorrectBody.expand.";
- void mergeAttributes(XModelObject update, boolean fire) {
+ void mergeAttributes(XModelObject update, boolean fire) throws XModelException {
XAttribute[] as = update.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -78,7 +78,7 @@
iln = Integer.parseInt(ln1);
ln1 = "" + (iln - 1);
}
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
ModelPlugin.getPluginLog().logError(e);
}
String ep = "ERROR: " + FindObjectHelper.makeRef(getPath() + ":" + ln1, ln + ":" + pos) + " " + er;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/CreateFileHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -18,7 +18,6 @@
import org.jboss.tools.common.meta.action.XAction;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.handlers.*;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.*;
public class CreateFileHandler extends DefaultCreateHandler {
@@ -55,11 +54,7 @@
final XModelObject q = c;
if(q != null) Display.getDefault().asyncExec(new Runnable() {
public void run() {
- try {
- XActionInvoker.invoke("Open", q, new Properties());
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError("CreateFileHandler:Open:" + e.getMessage());
- }
+ XActionInvoker.invoke("Open", q, new Properties());
}
});
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ExtensionChange.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -62,7 +62,7 @@
XTransactionUndo u = new XTransactionUndo(d, XTransactionUndo.EDIT);
undo.addUndoable(u);
try {
- XModelObject p = (XModelObject)file.getParent();
+ XModelObject p = file.getParent();
DefaultRemoveHandler.removeFromParent(file);
DefaultCreateHandler.addCreatedObject(p, o, FindObjectHelper.IN_NAVIGATOR_ONLY);
} catch (Exception e) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -171,7 +171,7 @@
return getAttributeValue("body");
}
- public void edit(String body) {
+ public void edit(String body) throws XModelException {
getModel().changeObjectAttribute(this, "body", body);
}
@@ -258,7 +258,7 @@
w.execute();
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if("body".equals(name) && listener != null) {
listener.bodyChanged(newValue);
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -27,6 +27,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.BodySource;
import org.jboss.tools.common.model.filesystems.FileAuxiliary;
@@ -350,7 +351,7 @@
return f;
}
- private void updateAuxiliary(Map<String,XModelObject> mc, Map<String,File> mf) {
+ private void updateAuxiliary(Map<String,XModelObject> mc, Map<String,File> mf) throws XModelException {
Iterator<String> it = mf.keySet().iterator();
while(it.hasNext()) {
String nm = (String)it.next();
@@ -445,7 +446,7 @@
f.set("forceLoad", b ? "true" : "");
}
- protected void updateLoaded(XModelObject o, File f) {
+ protected void updateLoaded(XModelObject o, File f) throws XModelException {
FileSystemPeer peer = getFileSystem().getPeer();
if(o instanceof FolderImpl) {
if(!o.getAttributeValue("name").equals(f.getName())) {
@@ -473,7 +474,13 @@
final File f1 = f;
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- if(question(f1) == 0) reload(o1, f1);
+ if(question(f1) == 0) {
+ try {
+ reload(o1, f1);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
+ }
}
});
}
@@ -492,7 +499,7 @@
}
}
- public void updateChildFile(XModelObject o, File f) {
+ public void updateChildFile(XModelObject o, File f) throws XModelException {
FileSystemPeer peer = getFileSystem().getPeer();
if(!registerFileInPeer(peer, f)) return;
int i = (!o.isModified()) ? 0 :
@@ -507,7 +514,7 @@
return (!o.getModelEntity().getName().equals(p.getProperty("entity")));
}
- private void reload(XModelObject o, File f) {
+ private void reload(XModelObject o, File f) throws XModelException {
Properties p = getEntityProperties(f);
if(!o.getModelEntity().getName().equals(p.getProperty("entity"))) {
o.removeFromParent();
@@ -538,7 +545,7 @@
}
}
- protected boolean updateNew(String pathpart, File f, Map<String,XModelObject> toRemove) {
+ protected boolean updateNew(String pathpart, File f, Map<String,XModelObject> toRemove) throws XModelException {
FileSystemPeer peer = getFileSystem().getPeer();
if(peer.contains(f) && !peer.isUpdated(f)) return false;
XModelObject c = null;
@@ -585,7 +592,7 @@
return null;
}
- protected void updateRemove(XModelObject o) {
+ protected void updateRemove(XModelObject o) throws XModelException {
boolean d = (o instanceof FolderImpl);
FileSystemPeer peer = getFileSystem().getPeer();
File rf = getChildIOFile(o);
@@ -703,7 +710,12 @@
if(d == null) {
d = new File(f, FileAnyImpl.toFileName(cs[i]));
}
- b &= saveChild(cs[i], peer, d);
+ try {
+ b &= saveChild(cs[i], peer, d);
+ } catch (XModelException ee) {
+ //TODO maybe it should be rethrown
+ ModelPlugin.getPluginLog().logError(ee);
+ }
}
t.remove(cs[i].getPathPart());
}
@@ -731,7 +743,7 @@
return b;
}
- public boolean saveChild(XModelObject c) {
+ public boolean saveChild(XModelObject c) throws XModelException {
if(c == null || c.getParent() != this) return false;
if(!c.isModified()) return true;
File folder = getFile();
@@ -753,7 +765,7 @@
return b;
}
- private boolean saveChild(XModelObject c, FileSystemPeer peer, File cf) {
+ private boolean saveChild(XModelObject c, FileSystemPeer peer, File cf) throws XModelException {
boolean b = true;
if(!cf.exists()) c.setModified(true);
if(!c.isModified()) return true;
@@ -809,7 +821,7 @@
return true;
}
- public boolean changeChildTimeStamp(XModelObject c) {
+ public boolean changeChildTimeStamp(XModelObject c) throws XModelException {
if(c == null || c.getParent() != this) return false;
File cf = new File(getFile(), FileAnyImpl.toFileName(c));
if(!cf.exists()) return saveChild(c);
@@ -823,7 +835,7 @@
return true;
}
- public void discardChildFile(XModelObject c) {
+ public void discardChildFile(XModelObject c) throws XModelException {
if(c == null || !c.isActive() || !c.isModified() || c.getParent() != this) return;
c.setModified(false);
XModelObjectLoaderUtil.updateModifiedOnSave(c);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -30,7 +30,7 @@
mount(object, p, entity);
}
- public XModelObject mount(XModelObject fs, Properties p, String entity) {
+ public XModelObject mount(XModelObject fs, Properties p, String entity) throws XModelException {
validateName(fs, p);
XModelObject c = XModelObjectLoaderUtil.createValidObject(fs.getModel(), entity, p);
addCreatedObject(fs, c, false, p);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -33,6 +33,7 @@
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelBuffer;
import org.jboss.tools.common.model.XModelConstants;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
import org.jboss.tools.common.model.event.XModelChangeManager;
@@ -258,15 +259,15 @@
return null;
}
- public void editObjectAttribute(XModelObject object, String attributeName, String value) {
+ public void editObjectAttribute(XModelObject object, String attributeName, String value) throws XModelException {
changeObjectAttribute(object, attributeName, value, true);
}
- public void changeObjectAttribute(XModelObject object, String attributeName, String value) {
+ public void changeObjectAttribute(XModelObject object, String attributeName, String value) throws XModelException {
changeObjectAttribute(object, attributeName, value, false);
}
- void changeObjectAttribute(XModelObject object, String attributeName, String value, boolean edit) {
+ void changeObjectAttribute(XModelObject object, String attributeName, String value, boolean edit) throws XModelException {
if(object == null || object.getPath() == null) return;
XModelEntity ent = object.getModelEntity();
XAttribute a = ent.getAttribute(attributeName);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -166,7 +166,7 @@
return nv;
}
- protected void onAttributeValueEdit(String name, String oldValue, String newValue) {
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
}
public boolean isModified() {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.model.loaders.impl;
import java.io.*;
+
import org.w3c.dom.*;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.loaders.*;
@@ -47,9 +48,12 @@
XModelObjectLoaderUtil.setTempBody(object, sw.toString());
object.setModified(true);
return true;
- } catch (Exception exc) {
+ } catch (IOException exc) {
ModelPlugin.getPluginLog().logError("DefaultEntityLoader:save(" + object.getPresentationString() + "):" + exc.getMessage());
return false;
+ } catch (XModelException e2) {
+ ModelPlugin.getPluginLog().logError("DefaultEntityLoader:save(" + object.getPresentationString() + "):" + e2.getMessage());
+ return false;
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -145,6 +145,10 @@
f.setUpdateLock();
try {
f.edit(body);
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ //TODO update method should throw XModelException
+ throw new RuntimeException(e);
} finally {
f.releaseUpdateLock();
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.model.options;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -55,7 +56,7 @@
return attributeName;
}
- public void setValue(String value) {
+ public void setValue(String value) throws XModelException {
XModelObject obj = PreferenceModelUtilities.getPreferenceModel().getByPath(option);
if(obj == null) {
if(ModelPlugin.isDebugEnabled()) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -65,7 +65,7 @@
}
public static void initPreferenceValue(XModel initialModel, Preference preference)
- {
+ throws XModelException {
String value = preference.getValue();
if (value == null || "".equals(value))
{
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/SwitchPreference.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -8,7 +8,9 @@
import java.util.*;
+import org.jboss.tools.common.model.XModelException;
+
/**
* @author Eskimo
*
@@ -44,7 +46,7 @@
return preference.getValue();
}
- public void setValue(String value) {
+ public void setValue(String value) throws XModelException {
if(switchPreference==null) throw new NullPointerException("switchPreference cannot be null, call setSwitchPreferenceFirst.");
Preference preference = (Preference)preferencesMap.get(switchPreference.getValue());
if(preference==null) throw new IllegalStateException("Preference in't added for switch value '" + switchPreference.getValue() + "'");
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/HiddenPaletteTabsHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -57,7 +57,7 @@
}
}
- public void execute(XModel model, String[][] vs, Map objects) {
+ public void execute(XModel model, String[][] vs, Map objects) throws XModelException {
fireTransactionEvent("transaction_begin");
try {
XUndoManager undo = model.getUndoManager();
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/search/impl/SearchDefaultHandler.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -62,7 +62,7 @@
return sc;
}
- private XModelObject findOrCreateDefaultSearch(XModelObject object, XModelObject[] objects) {
+ private XModelObject findOrCreateDefaultSearch(XModelObject object, XModelObject[] objects) throws XModelException {
XModel model = object.getModel();
XModelObject sr = model.getByPath("XStudio/Search");
XModelObject ds = sr.getChildByPath("Default");
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/AbstractTableHelper.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -52,7 +52,7 @@
return (f == null) ? "" : f.getAttributeValue(getHeader()[c]);
}
- public void setValueAt(int r, int c, String value) {
+ public void setValueAt(int r, int c, String value) throws XModelException {
XModelObject f = getModelObject(r);
if(f == null) return;
f.getModel().changeObjectAttribute(f, getHeader()[c], value);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -48,7 +48,7 @@
String n = activation[i][1];
try {
b.loadClass(n);
- } catch (Exception e) {
+ } catch (ClassNotFoundException e) {
ModelPlugin.getPluginLog().logError("ClassLoaderUtil:activate: Cannot find class " + n);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2008-04-04 16:16:17 UTC (rev 7337)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2008-04-04 16:18:29 UTC (rev 7338)
@@ -912,11 +912,11 @@
return sb.toString();
}
- public static void mergeAttributes(XModelObject destination, XModelObject source) {
+ public static void mergeAttributes(XModelObject destination, XModelObject source) throws XModelException {
mergeAttributes(destination, source, destination.isActive());
}
- public static void mergeAttributes(XModelObject destination, XModelObject source, boolean fire) {
+ public static void mergeAttributes(XModelObject destination, XModelObject source, boolean fire) throws XModelException {
XAttribute[] as = destination.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7337 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 12:16:17 -0400 (Fri, 04 Apr 2008)
New Revision: 7337
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
Log:
JBIDE-1749
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2008-04-04 15:25:06 UTC (rev 7336)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2008-04-04 16:16:17 UTC (rev 7337)
@@ -152,6 +152,8 @@
<XModelAttribute default="identity" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="org.jboss.seam.security.identity" name="name" xmlname="name"/>
<XModelAttributeReference
attributes="class,scope,precedence,installed,auto-create,startup"
entity="SeamComponent20" name="component"/>
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7336 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-04-04 11:25:06 -0400 (Fri, 04 Apr 2008)
New Revision: 7336
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1946
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2008-04-04 14:39:38 UTC (rev 7335)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2008-04-04 15:25:06 UTC (rev 7336)
@@ -33,6 +33,7 @@
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
import org.jboss.tools.vpe.editor.template.VpeTemplate;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMAttr;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -296,13 +297,30 @@
}
+ @Override
+ public void openIncludeEditor(VpePageContext pageContext,
+ Element sourceElement, Object data) {
+
+ if (data instanceof TemplateFileInfo) {
+ FileUtil.openEditor(((TemplateFileInfo) data).getTemplateFile());
+ }
+ }
+
protected abstract VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument);
static class TemplateFileInfo {
- IFile templateFile;
+ private IFile templateFile;
TemplateFileInfo(IFile templateFile) {
this.templateFile = templateFile;
}
+
+ public IFile getTemplateFile() {
+ return templateFile;
+ }
+
+ public void setTemplateFile(IFile templateFile) {
+ this.templateFile = templateFile;
+ }
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-04-04 14:39:38 UTC (rev 7335)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-04-04 15:25:06 UTC (rev 7336)
@@ -20,7 +20,9 @@
import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.editors.text.ILocationProvider;
+import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
@@ -28,6 +30,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.vpe.VpePlugin;
public class FileUtil {
@@ -93,5 +96,23 @@
}
return file;
}
+
+ /**
+ * open editor
+ * @param file
+ */
+ public static void openEditor(IFile file) {
+ IWorkbenchPage workbenchPage = VpePlugin.getDefault().getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ try {
+ if (file != null) {
+ IDE.openEditor(workbenchPage, file, true);
+ }
+ } catch (Exception ex) {
+ VpePlugin.reportProblem(ex);
+ }
+
+ }
+
}
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7335 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-04-04 10:39:38 -0400 (Fri, 04 Apr 2008)
New Revision: 7335
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
corrected tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-04 14:31:21 UTC (rev 7334)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-04 14:39:38 UTC (rev 7335)
@@ -1,13 +1,13 @@
/*******************************************************************************
-* Copyright (c) 2007 Red Hat, Inc.
-* Distributed under license by Red Hat, Inc. All rights reserved.
-* This program is made available under the terms of the
-* Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Red Hat, Inc. - initial API and implementation
-******************************************************************************/
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import org.eclipse.core.resources.IFile;
@@ -20,6 +20,7 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -27,20 +28,22 @@
/**
* @author Max Areshkau
- *
- * JUnit test for http://jira.jboss.com/jira/browse/JBIDE-788
+ *
+ * JUnit test for http://jira.jboss.com/jira/browse/JBIDE-788
*/
-public class JBIDE788Test extends VpeTest{
-
+public class JBIDE788Test extends VpeTest {
+
private static final String IMPORT_PROJECT_NAME = "jsfTest";
-
+
private static final String CA_NAME = "org.eclipse.wst.html.HTML_DEFAULT";
-
+
public JBIDE788Test(String name) {
super(name);
}
+
/**
* Tests inner nodes include URI
+ *
* @throws Throwable
*/
public void testCAforIncludeTaglibInInenerNodes() throws Throwable {
@@ -48,18 +51,22 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
- baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml", 395, 185);
- baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml", 503, 125);
- baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml", 567, 199);
+ baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml",
+ 395, 185);
+ baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml",
+ 503, 125);
+ baseCheckofCA(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml",
+ 567, 199);
+
// check exception
if (getException() != null) {
-
+
throw getException();
- }
+ }
}
-
+
/**
* Tests Path proposals of CA
*/
@@ -68,7 +75,7 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 514, 3);
baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 586, 5);
@@ -76,12 +83,14 @@
baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 719, 46);
// check exception
if (getException() != null) {
-
+
throw getException();
- }
- }
+ }
+ }
+
/**
* Tests CA for Messages Bundles and EL Values
+ *
* @throws Throwable
*/
public void testCAforMessageBundlesAndELExpressions() throws Throwable {
@@ -89,19 +98,21 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
- baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1245, 13);
-
+ baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml",
+ 1245, 13);
+
// check exception
if (getException() != null) {
-
+
throw getException();
}
}
-
+
/**
* Tests CA for proposals for JSFC
+ *
* @throws Throwable
*/
public void testCAforForJSFCProposals() throws Throwable {
@@ -109,18 +120,21 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
- baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1200, 112);
-
+ // Tests CA
+ baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml",
+ 1200, 112);
+
// check exception
if (getException() != null) {
-
+
throw getException();
}
-
+
}
+
/**
* Tests CA on html files
+ *
* @throws Throwable
*/
public void testCAforHtmlFiles() throws Throwable {
@@ -128,17 +142,22 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
baseCheckofCA(CA_NAME, "JBIDE/788/testCAforHtml.html", 39, 79);
+ // cursor will set after "<" simbol
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforHtml.html", "a", 26);
+
// check exception
if (getException() != null) {
-
+
throw getException();
}
}
+
/**
* Tests CA on jsp files
+ *
* @throws Throwable
*/
public void testCAforJSPFiles() throws Throwable {
@@ -146,16 +165,23 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
baseCheckofCA(CA_NAME, "JBIDE/788/testCAforJSP.jsp", 1000, 110);
+
+ // cursor will set after "outputText" tag
+ // checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforJSP.jsp", "s",
+ // 1032);
+
// check exception
if (getException() != null) {
-
+
throw getException();
}
}
+
/**
* Tests CA on jsp files
+ *
* @throws Throwable
*/
public void testCAforXHTMLFiles() throws Throwable {
@@ -163,24 +189,40 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
baseCheckofCA(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", 745, 96);
+
+ // cursor will set after "<" simbol
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "c",
+ 687);
+
+ // cursor will set after "outputText" tag
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "s",
+ 778);
+
// check exception
if (getException() != null) {
-
+
throw getException();
}
}
+
/**
- * Perfoms base test of ca, compare number of proposals which what returned by ca
- * with etalon
- * @param caName - content assistent name
- * @param testPagePath - test page
- * @param position - position on test page
- * @param numberOfProposals - standard number of proposals
- * @throws CoreException
+ * Perfoms base test of ca, compare number of proposals which what returned
+ * by ca with etalon
+ *
+ * @param caName -
+ * content assistent name
+ * @param testPagePath -
+ * test page
+ * @param position -
+ * position on test page
+ * @param numberOfProposals -
+ * standard number of proposals
+ * @throws CoreException
*/
- private void baseCheckofCA(String caName,String testPagePath, int position, int numberOfProposals) throws CoreException {
+ private void baseCheckofCA(String caName, String testPagePath,
+ int position, int numberOfProposals) throws CoreException {
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
IMPORT_PROJECT_NAME);
@@ -190,24 +232,103 @@
IEditorInput input = new FileEditorInput(file);
assertNotNull("Editor input is null", input);
-
+
// open and get editor
JSPMultiPageEditor part = openEditor(input);
-
- //sets cursor position
- part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(position);
+
+ // sets cursor position
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
+ position);
TestUtil.waitForJobs();
TestUtil.delay(2000);
- SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor)part.getSourceEditor()).getSourceViewerConfigurationForTest();
- //errase errors which can be on start of editor(for example xuklunner not found)
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
+ .getSourceEditor()).getSourceViewerConfigurationForTest();
+ // errase errors which can be on start of editor(for example xuklunner
+ // not found)
setException(null);
- StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
- IContentAssistant iContentAssistant = stvc.getContentAssistant((ISourceViewer) part.getSourceEditor().getAdapter(ISourceViewer.class));
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc
+ .getContentAssistant((ISourceViewer) part.getSourceEditor()
+ .getAdapter(ISourceViewer.class));
assertNotNull(iContentAssistant);
- IContentAssistProcessor iContentAssistProcessor= iContentAssistant.getContentAssistProcessor(caName);
+ IContentAssistProcessor iContentAssistProcessor = iContentAssistant
+ .getContentAssistProcessor(caName);
assertNotNull(iContentAssistProcessor);
- ICompletionProposal[] results = iContentAssistProcessor.computeCompletionProposals(part.getSourceEditor().getTextViewer(), position);
+ ICompletionProposal[] results = iContentAssistProcessor
+ .computeCompletionProposals(part.getSourceEditor()
+ .getTextViewer(), position);
assertNotNull(results);
- assertEquals(numberOfProposals,results.length);
+ assertEquals(numberOfProposals, results.length);
}
+
+ /**
+ *
+ * @param caName
+ * @param testPagePath
+ * @param partOfString
+ * @param position
+ * @param numberOfProposals
+ * @throws CoreException
+ */
+ private void checkOfCAByStartString(String caName, String testPagePath,
+ String partOfString, int position) throws CoreException {
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // insert string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, 0, partOfString);
+
+ int newPosition = position + partOfString.length();
+
+ // sets cursor position
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
+ newPosition);
+ TestUtil.waitForJobs();
+ TestUtil.delay(2000);
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
+ .getSourceEditor()).getSourceViewerConfigurationForTest();
+ // errase errors which can be on start of editor(for example xuklunner
+ // not found)
+ setException(null);
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc
+ .getContentAssistant((ISourceViewer) part.getSourceEditor()
+ .getAdapter(ISourceViewer.class));
+ assertNotNull(iContentAssistant);
+ IContentAssistProcessor iContentAssistProcessor = iContentAssistant
+ .getContentAssistProcessor(caName);
+ assertNotNull(iContentAssistProcessor);
+ ICompletionProposal[] results = iContentAssistProcessor
+ .computeCompletionProposals(part.getSourceEditor()
+ .getTextViewer(), newPosition);
+
+ // remove inserted string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, partOfString.length(), "");
+
+ assertNotNull(results);
+
+ for (int i = 0; i < results.length; i++) {
+
+ String displayString = ((ICompletionProposal) results[i])
+ .getDisplayString();
+ assertNotNull(displayString);
+
+ System.out.print("\n" + displayString);
+ assertEquals(true, displayString.startsWith(partOfString));
+ }
+
+ }
+
}
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7334 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-04-04 10:31:21 -0400 (Fri, 04 Apr 2008)
New Revision: 7334
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java
Log:
JBIDE-1003 Fixed New Seam Entity Wizard for War Projects. Added xhtml templates.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2008-04-04 14:08:11 UTC (rev 7333)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2008-04-04 14:31:21 UTC (rev 7334)
@@ -88,6 +88,16 @@
static {
// initialize war files mapping
ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/edit.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/list.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", //$NON-NLS-1$ //$NON-NLS-2$
"${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
FileMapping.TYPE.WAR,
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7333 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 10:08:11 -0400 (Fri, 04 Apr 2008)
New Revision: 7333
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java 2008-04-04 14:04:29 UTC (rev 7332)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelException.java 2008-04-04 14:08:11 UTC (rev 7333)
@@ -42,7 +42,7 @@
}
- public static void rethrow(Throwable cause) throws CoreException {
+ public static void rethrow(Throwable cause) throws XModelException {
if(cause instanceof XModelException) {
throw (XModelException)cause;
}
17 years, 8 months
- 1
- 0
JBoss Tools SVN: r7332 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor: edit and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-04 10:04:29 -0400 (Fri, 04 Apr 2008)
New Revision: 7332
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigGuiEditor.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFModel.java
Log:
JBIDE-895
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigGuiEditor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigGuiEditor.java 2008-04-04 13:10:21 UTC (rev 7331)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigGuiEditor.java 2008-04-04 14:04:29 UTC (rev 7332)
@@ -11,6 +11,7 @@
package org.jboss.tools.jsf.ui.editor;
import org.jboss.tools.common.editor.AbstractSectionEditor;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.layout.GridData;
@@ -95,7 +96,7 @@
guiControl.layout();
wrapper.update();
wrapper.layout();
- } catch (Exception ex) {
+ } catch (CoreException ex) {
JsfUiPlugin.getPluginLog().logError(ex);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java 2008-04-04 13:10:21 UTC (rev 7331)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java 2008-04-04 14:04:29 UTC (rev 7332)
@@ -27,6 +27,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.meta.action.XAction;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.gef.GEFGraphicalViewer;
import org.jboss.tools.common.gef.edit.GEFRootEditPart;
@@ -70,13 +71,11 @@
public void doDoubleClick(boolean cf) {
try {
- XAction action = DnDUtil.getEnabledAction(
- (XModelObject) getLinkModel().getSource(), null,
- "Properties.Properties");
+ XModelObject s = (XModelObject) getLinkModel().getSource();
+ XAction action = DnDUtil.getEnabledAction(s, null, "Properties.Properties");
if (action != null)
- action.executeHandler(
- (XModelObject) getLinkModel().getSource(), null);
- } catch (Exception e) {
+ action.executeHandler(s, null);
+ } catch (XModelException e) {
JsfUiPlugin.getPluginLog().logError(e);
}
}
@@ -86,17 +85,12 @@
}
public void doMouseUp(boolean cf) {
+ if(!(getTarget() instanceof GroupEditPart)) return;
+ GroupEditPart g = (GroupEditPart)getTarget();
if (cf && getLink().isShortcut()) {
- try {
- ((GEFGraphicalViewer) getViewer()).getGEFEditor()
- .getModelSelectionProvider().setSelection(
- new StructuredSelection(
- ((GroupEditPart) getTarget())
- .getGroupModel().getSource()));
- } catch (Exception ex) {
- JsfUiPlugin.getPluginLog().logError(ex);
- }
- return;
+ ((GEFGraphicalViewer) getViewer()).getGEFEditor()
+ .getModelSelectionProvider().setSelection(
+ new StructuredSelection(g.getGroupModel().getSource()));
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2008-04-04 13:10:21 UTC (rev 7331)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2008-04-04 14:04:29 UTC (rev 7332)
@@ -19,6 +19,7 @@
import org.jboss.tools.common.model.ui.attribute.XAttributeSupport;
import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IPropertyFieldEditor;
+import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor;
import org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx;
import org.eclipse.swt.SWT;
@@ -143,20 +144,14 @@
if (controls != null) anyLabel = controls[0];
}
if (PROPERTY_CLASS.equals(propertyEditor.getAttributeName())) {
- try {
- Class wraperClass = Class.forName("org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor");
- Constructor wraperConstructor = wraperClass.getConstructor(new Class[]{IWidgetSettings.class});
- IPropertyFieldEditor wraper = (IPropertyFieldEditor)wraperConstructor.newInstance(new Object[]{settings});
- ExtendedFieldEditor fe = (ExtendedFieldEditor)wraper;
- fe.setLabelText(propertyEditor.getLabelText());
- wraper.setPropertyEditor(propertyEditor);
- fe.fillIntoGrid(composite, 2);
- fe.setEnabled(xmo.isAttributeEditable(propertyEditor.getAttributeName()));
- support.registerFieldEditor(propertyEditor.getAttributeName(), (ExtendedFieldEditor)wraper);
- anyLabel = fe.getLabelComposite(composite);
- } catch (Exception e) {
- JsfUiPlugin.getPluginLog().logError(e);
- }
+ IPropertyFieldEditor wraper = new JavaHyperlinkLineFieldEditor(settings);
+ ExtendedFieldEditor fe = (ExtendedFieldEditor)wraper;
+ fe.setLabelText(propertyEditor.getLabelText());
+ wraper.setPropertyEditor(propertyEditor);
+ fe.fillIntoGrid(composite, 2);
+ fe.setEnabled(xmo.isAttributeEditable(propertyEditor.getAttributeName()));
+ support.registerFieldEditor(propertyEditor.getAttributeName(), (ExtendedFieldEditor)wraper);
+ anyLabel = fe.getLabelComposite(composite);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java 2008-04-04 13:10:21 UTC (rev 7331)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java 2008-04-04 14:04:29 UTC (rev 7332)
@@ -113,14 +113,8 @@
public void updateModelModifiedProperty(Object oldValue, Object newValue) {
if (getJSFModel() != null) {
- try {
- if (oldValue == null ||!oldValue.equals(newValue))
- getJSFModel().setModified(true);
- } catch (Exception exception) {
- JsfUiPlugin.getPluginLog().logError(exception);
- if (newValue != null)
- getJSFModel().setModified(true);
- }
+ if (oldValue == null || !oldValue.equals(newValue))
+ getJSFModel().setModified(true);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFModel.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFModel.java 2008-04-04 13:10:21 UTC (rev 7331)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFModel.java 2008-04-04 14:04:29 UTC (rev 7332)
@@ -12,8 +12,6 @@
import java.util.*;
-import org.xml.sax.*;
-
import java.beans.*;
import org.eclipse.swt.graphics.Font;
@@ -50,7 +48,7 @@
public JSFModel() {
try {
setName("Struts Model");
- } catch (Exception ex) {
+ } catch (PropertyVetoException ex) {
JsfUiPlugin.getPluginLog().logError(ex);
}
}
@@ -79,7 +77,7 @@
return options;
}
- public JSFModel(Object data) throws SAXException, Exception {
+ public JSFModel(Object data) {
this();
setData(((XModelObject) data).getChildByPath("process"));
map.setData((XModelObject) data);
@@ -163,7 +161,7 @@
XModelTreeListenerSWTSync listener = null;
- public void setData(Object data) throws Exception {
+ public void setData(Object data) {
source = (XModelObject) data;
if (source == null) {
return;
@@ -334,16 +332,16 @@
public void structureChanged(XModelTreeEvent event) {
JSFElement element;
+ Object obj = event.getModelObject().getPath();
+ if (obj == null)
+ return;
+ if (map == null)
+ return;
+ element = (JSFElement) map.get(obj);
+ if (element == null) {
+ return;
+ }
try {
- Object obj = event.getModelObject().getPath();
- if (obj == null)
- return;
- if (map == null)
- return;
- element = (JSFElement) map.get(obj);
- if (element == null) {
- return;
- }
if (event.kind() == XModelTreeEvent.STRUCTURE_CHANGED) {
element.structureChanged(event);
} else if (event.kind() == XModelTreeEvent.CHILD_ADDED) {
@@ -432,7 +430,7 @@
}
public class JSFHashtable implements XModelTreeListener {
- Hashtable<Object, IJSFElement> map = new Hashtable<Object, IJSFElement>();
+ private Hashtable<Object, IJSFElement> map = new Hashtable<Object, IJSFElement>();
XModelObject source;
@@ -473,9 +471,11 @@
if (!source.getAttributeValue("name").equals(name)) {
name = source.getAttributeValue("name");
- Enumeration keys = map.keys();
+ Enumeration<Object> keys = map.keys();
while (keys.hasMoreElements()) {
- path = (String) keys.nextElement();
+ Object key = keys.nextElement();
+ if(!(key instanceof String)) continue;
+ path = (String) key;
element = (JSFElement) map.get(path);
if (element != null) {
if (element.getSource() != null) {
17 years, 8 months
- 1
- 0