[jbosstools-commits] 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.

Friday, 4 April 2008


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 {
 	}
 
 }


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] 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.