Attachment 60134 Details for Bug 175837 – Validation checkbox

[patch] Validation checkbox

patch.txt (text/plain), 10.95 KB, created by Alexander Fedorov

on 2007-03-02 03:43:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Fedorov

Created: 2007-03-02 03:43:13 EST

Size: 10.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.bridge.ui
>Index: src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelOperation.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelOperation.java,v
>retrieving revision 1.6
>diff -u -r1.6 TransformToGenModelOperation.java
>--- src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelOperation.java	28 Feb 2007 19:39:43 -0000	1.6
>+++ src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelOperation.java	2 Mar 2007 08:30:06 -0000
>@@ -132,16 +132,17 @@
> 				throw new CoreException(status);
> 			}
> 			content = (Mapping) loadHelper.getContentsRoot();
>-			Diagnostic mapIsValid = ValidationHelper.validate(content, true, monitor);
>-			monitor.worked(60);
>-			status = getFirst(mapIsValid);
>-			if (Diagnostic.CANCEL == status.getSeverity()) {
>-				throw new CoreException(Plugin.createCancel(cancelMessage));
>-			} else if(Diagnostic.ERROR == status.getSeverity()) {
>-				throw new CoreException(status);
>-			} else {
>-				return content;
>+			if (getOptions().getValidateMapModel()) {
>+				Diagnostic mapIsValid = ValidationHelper.validate(content, true, monitor);
>+				monitor.worked(60);
>+				status = getFirst(mapIsValid);
>+				if (Diagnostic.CANCEL == status.getSeverity()) {
>+					throw new CoreException(Plugin.createCancel(cancelMessage));
>+				} else if(Diagnostic.ERROR == status.getSeverity()) {
>+					throw new CoreException(status);
>+				}
> 			}
>+			return content;
> 		} catch (CoreException e) {
> 			throw e;
> 		} catch (Exception e) {
>@@ -269,7 +270,11 @@
> 			return validate;
> 			
> 		} catch (Exception ex) {
>-			return Plugin.createError(ex.getMessage(), ex);
>+			String message = ex.getMessage();
>+			if (message == null) {
>+				message = Messages.TransformToGenModelOperation_e_generator_creation;
>+			}
>+			return Plugin.createError(message, ex);
> 		} finally {
> 			if (monitor != null) {
> 				monitor.done();
>Index: src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java,v
>retrieving revision 1.5
>diff -u -r1.5 TransformOptions.java
>--- src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java	1 Mar 2007 15:26:53 -0000	1.5
>+++ src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java	2 Mar 2007 08:30:06 -0000
>@@ -27,12 +27,14 @@
> 	private static final String PREF_GENERATE_RCP = "generate_rcp"; //$NON-NLS-1$
> 	private static final String PREF_USE_MAP_MODE = "use_map_mode"; //$NON-NLS-1$
> 	private static final String PREF_USE_RUNTIME_FIGURES = "use_runtime_figures"; //$NON-NLS-1$
>+	private static final String PREF_VALIDATE_MAPMODEL = "validate_mapmodel"; //$NON-NLS-1$
> 	private static final String PREF_FIGURE_TEMPLATES = "dynamic_figure_templates"; //$NON-NLS-1$
> 	
> 	private static String[] PROP_NAMES = new String[] {
> 		PREF_GENERATE_RCP, 
> 		PREF_USE_MAP_MODE, 
> 		PREF_USE_RUNTIME_FIGURES,
>+		PREF_VALIDATE_MAPMODEL,
> 		PREF_FIGURE_TEMPLATES
> 		};
> 	
>@@ -78,6 +80,10 @@
> 		return getPreferences().getBoolean(PREF_USE_RUNTIME_FIGURES);
> 	}
> 
>+	public boolean getValidateMapModel() {
>+		return getPreferences().getBoolean(PREF_VALIDATE_MAPMODEL);
>+	}
>+
> 	public URL getFigureTemplatesPath() {
> 		final String value = getPreferences().getString(PREF_FIGURE_TEMPLATES);
> 		if (value == null || value.length() == 0) {
>@@ -103,6 +109,10 @@
> 		getPreferences().setValue(PREF_USE_RUNTIME_FIGURES, value);
> 	}
> 
>+	public void setValidateMapModel(boolean value) {
>+		getPreferences().setValue(PREF_VALIDATE_MAPMODEL, value);
>+	}
>+
> 	public void setFigureTemplatesPath(URL path) {
> 		getPreferences().setValue(PREF_FIGURE_TEMPLATES, path == null ? "" : path.toString()); //$NON-NLS-1$
> 	}
>@@ -114,6 +124,7 @@
> 		node.putBoolean(PREF_GENERATE_RCP, false);
> 		node.putBoolean(PREF_USE_MAP_MODE, true);
> 		node.putBoolean(PREF_USE_RUNTIME_FIGURES, true);
>+		node.putBoolean(PREF_VALIDATE_MAPMODEL, true);
> 
> 	}
> 	
>Index: src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java,v
>retrieving revision 1.5
>diff -u -r1.5 TransformToGenModelWizard.java
>--- src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java	1 Mar 2007 16:34:40 -0000	1.5
>+++ src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java	2 Mar 2007 08:30:06 -0000
>@@ -139,13 +139,12 @@
> 			setErrorMessage(s[0].getMessage());
> 			return false;
> 		} catch (InvocationTargetException ex) {
>+			String message = Messages.TransformToGenModelOperation_e_generator_creation;
> 			Throwable targetException = ex.getTargetException();
> 			if (targetException != null && targetException.getMessage() != null) {
>-				String message = targetException.getMessage();
>-				if (message == null) {
>-					message = Messages.TransformToGenModelWizard_e_generator_creation;
>-				}
>+				message = targetException.getMessage();
> 			}
>+			setErrorMessage(message);
> 			return false;
> 		} catch (InterruptedException ex){
> 			setErrorMessage(Messages.TransformToGenModelWizard_e_operation_cancelled);
>Index: src/org/eclipse/gmf/internal/bridge/transform/MapModelConfigurationPage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/MapModelConfigurationPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 MapModelConfigurationPage.java
>--- src/org/eclipse/gmf/internal/bridge/transform/MapModelConfigurationPage.java	1 Mar 2007 16:34:40 -0000	1.3
>+++ src/org/eclipse/gmf/internal/bridge/transform/MapModelConfigurationPage.java	2 Mar 2007 08:30:06 -0000
>@@ -18,16 +18,55 @@
> import org.eclipse.emf.ecore.resource.ResourceSet;
> import org.eclipse.gmf.internal.common.ui.ResourceLocationProvider;
> import org.eclipse.gmf.mappings.Mapping;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
> 
> 
> class MapModelConfigurationPage extends ModelConfigurationPage {
> 	
> 	private static final String FILE_EXT_GMFMAP = "gmfmap"; //$NON-NLS-1$
> 
>+	private Button myValidateButton;
>+
> 	MapModelConfigurationPage(String pageId, ResourceLocationProvider rlp, ResourceSet resourceSet) {
> 		super(pageId, rlp, resourceSet);
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.gmf.internal.common.ui.ModelSelectionPage#createAdditionalControls(org.eclipse.swt.widgets.Composite)
>+	 */
>+	@Override
>+	protected void createAdditionalControls(Composite parent) {
>+		Composite createComposite = new Composite(parent, SWT.NONE);
>+		createComposite.setLayout(new GridLayout(2, true));
>+		{
>+			GridData gd = new GridData();
>+			gd.grabExcessHorizontalSpace = true;
>+			createComposite.setLayoutData(gd);
>+		}
>+
>+		myValidateButton = new Button(createComposite, SWT.CHECK);
>+		myValidateButton.setText(Messages.MapModelConfigurationPage_btn_validate);
>+		setButtonLayoutData(myValidateButton);
>+		myValidateButton.addSelectionListener(new SelectionAdapter(){
>+			
>+			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
>+				reloadResource();
>+			}
>+			
>+		});
>+	}
>+
>+	@Override
>+	protected void initControls() {
>+		super.initControls();
>+		myValidateButton.setSelection(getOperation().getOptions().getValidateMapModel());
>+	}
>+
> 	protected String getModelFileExtension() {
> 		return FILE_EXT_GMFMAP;
> 	}
>@@ -57,4 +96,9 @@
> 			}
> 		}
> 	}
>+
>+	void reloadResource() {
>+		getOperation().getOptions().setValidateMapModel(myValidateButton.getSelection());
>+		setResource(loadResource());
>+	}
> }
>Index: src/org/eclipse/gmf/internal/bridge/transform/Messages.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/Messages.java,v
>retrieving revision 1.3
>diff -u -r1.3 Messages.java
>--- src/org/eclipse/gmf/internal/bridge/transform/Messages.java	7 Feb 2007 12:11:12 -0000	1.3
>+++ src/org/eclipse/gmf/internal/bridge/transform/Messages.java	2 Mar 2007 08:30:06 -0000
>@@ -31,8 +31,12 @@
> 
> 	public static String GMFGenNewFileCreationPage_e_filename;
> 
>+	public static String MapModelConfigurationPage_btn_validate;
>+
> 	public static String StaleGenModelDetector_stale;
> 
>+	public static String TransformToGenModelOperation_e_generator_creation;
>+
> 	public static String TransformToGenModelOperation_e_genmodel_load;
> 
> 	public static String TransformToGenModelOperation_e_genmodel_load_cancelled;
>@@ -73,8 +77,6 @@
> 
> 	public static String TransformToGenModelWizard_descr_options;
> 
>-	public static String TransformToGenModelWizard_e_generator_creation;
>-
> 	public static String TransformToGenModelWizard_e_operation_cancelled;
> 
> 	public static String TransformToGenModelWizard_title_genmodel;
>Index: src/org/eclipse/gmf/internal/bridge/transform/messages.properties
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/messages.properties,v
>retrieving revision 1.3
>diff -u -r1.3 messages.properties
>--- src/org/eclipse/gmf/internal/bridge/transform/messages.properties	7 Feb 2007 12:11:12 -0000	1.3
>+++ src/org/eclipse/gmf/internal/bridge/transform/messages.properties	2 Mar 2007 08:30:06 -0000
>@@ -13,7 +13,7 @@
> TransformToGenModelOperation_task_validate=Validating ...
> TransformToGenModelOperation_e_mapping_invalid=Invalid Mapping Model
> TransformToGenModelOperation_e_null_gmfgen_uri=Target gmfgen URI should be specified
>-TransformToGenModelWizard_e_generator_creation=Errors while creating generator model
>+TransformToGenModelOperation_e_generator_creation=Errors while creating generator model
> TransformToGenModelWizard_e_operation_cancelled=Operation cancelled
> TransformToGenModelOperation_e_genmodel_load_cancelled=GenModel loading was interrupted
> TransformToGenModelOperation_task_detect=Detecting ...
>@@ -40,6 +40,8 @@
> GenModelConfigurationPage_btn_refresh_stale=Refresh stale GenModel...
> GMFGenNewFileCreationPage_e_filename=The file name must end in ".{0}"
> 
>+MapModelConfigurationPage_btn_validate=Validate
>+
> #XXX: remove after fix of https://bugs.eclipse.org/bugs/show_bug.cgi?id=172000
> ResourceGroup_nameExists = The same name already exists.
> ResourceGroup_folderEmpty = No folder specified.

Actions: View | Diff

Attachments on bug 175837: 60134 | 60367