Attachment 60367 Details for Bug 175837 – Validation result page

[patch] Validation result page

patch2.txt (text/plain), 22.62 KB, created by Alexander Fedorov

on 2007-03-07 07:22:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Fedorov

Created: 2007-03-07 07:22:48 EST

Size: 22.62 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	7 Mar 2007 12:11:10 -0000
>@@ -60,7 +60,7 @@
> 	private GenModelDetector myGMDetector;
> 	private GenModel myGenModel;
> 	
>-	private IStatus myLoadMapmodelStatus = Status.CANCEL_STATUS;
>+	private Diagnostic myMapmodelValidationResult = Diagnostic.CANCEL_INSTANCE;
> 	private IStatus myStaleGenmodelStatus = Status.CANCEL_STATUS;
> 	
> 	public TransformToGenModelOperation() {
>@@ -87,9 +87,9 @@
> 		return this.myMapping;
> 	}
> 	
>-	private void setMapping(Mapping m, IStatus loadStatus) {
>+	private void setMapping(Mapping m, Diagnostic validationResult) {
> 		this.myMapping = m;
>-		this.myLoadMapmodelStatus = loadStatus;
>+		this.myMapmodelValidationResult = validationResult;
> 		myGMDetector = (m != null) ? new GenModelDetector(m) : null;
> 		myGenModel = null;
> 	}
>@@ -98,8 +98,8 @@
> 		return myGMDetector;
> 	}
> 	
>-	public IStatus getLoadMappingStatus() {
>-		return this.myLoadMapmodelStatus;
>+	public Diagnostic getMapmodelValidationResult() {
>+		return this.myMapmodelValidationResult;
> 	}
> 	
> 	public IStatus getStaleGenmodelStatus() {
>@@ -109,6 +109,7 @@
> 	public Mapping loadMappingModel(ResourceSet rs, URI uri, IProgressMonitor pm) throws CoreException {
> 		Mapping content = null;
> 		IStatus status = Status.CANCEL_STATUS;
>+		Diagnostic validation = Diagnostic.CANCEL_INSTANCE;
> 		IProgressMonitor monitor = null;
> 		try {
> 			checkResourceSet(rs);
>@@ -132,23 +133,19 @@
> 				throw new CoreException(status);
> 			}
> 			content = (Mapping) loadHelper.getContentsRoot();
>-			Diagnostic mapIsValid = ValidationHelper.validate(content, true, monitor);
>+			validation = ValidationHelper.validate(content, true, monitor);
> 			monitor.worked(60);
>-			status = getFirst(mapIsValid);
>-			if (Diagnostic.CANCEL == status.getSeverity()) {
>+			if (Diagnostic.CANCEL == validation.getSeverity()) {
> 				throw new CoreException(Plugin.createCancel(cancelMessage));
>-			} else if(Diagnostic.ERROR == status.getSeverity()) {
>-				throw new CoreException(status);
>-			} else {
>-				return content;
> 			}
>+			return content;
> 		} catch (CoreException e) {
> 			throw e;
> 		} catch (Exception e) {
> 			IStatus error = Plugin.createError(Messages.TransformToGenModelOperation_e_load_mapping_model, e);
> 			throw new CoreException(error);
> 		} finally {
>-			setMapping(content, status);
>+			setMapping(content, validation);
> 			if (monitor != null) {
> 				monitor.done();
> 			}
>@@ -269,7 +266,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();
>@@ -289,7 +290,7 @@
> 		}
> 	}
> 	
>-	private IStatus getFirst(Diagnostic d) {
>+	static IStatus getFirst(Diagnostic d) {
> 		if (d == null) {
> 			return Status.OK_STATUS;
> 		}
>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	7 Mar 2007 12:11:10 -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_IGNORE_MAPMODEL_VALIDATION = "ignore_mapmodel_validation"; //$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_IGNORE_MAPMODEL_VALIDATION,
> 		PREF_FIGURE_TEMPLATES
> 		};
> 	
>@@ -78,6 +80,10 @@
> 		return getPreferences().getBoolean(PREF_USE_RUNTIME_FIGURES);
> 	}
> 
>+	public boolean getIgnoreMapModelValidation() {
>+		return getPreferences().getBoolean(PREF_IGNORE_MAPMODEL_VALIDATION);
>+	}
>+
> 	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 setIgnoreMapModelValidation(boolean value) {
>+		getPreferences().setValue(PREF_IGNORE_MAPMODEL_VALIDATION, 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_IGNORE_MAPMODEL_VALIDATION, false);
> 
> 	}
> 	
>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	7 Mar 2007 12:11:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
>+import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.resource.ResourceSet;
> import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
>@@ -39,15 +40,19 @@
> 	private static final String PAGE_ID_GMFGEN = "gmfgen"; //$NON-NLS-1$
> 	private static final String PAGE_ID_GENMODEL = "genmodel"; //$NON-NLS-1$
> 	private static final String PAGE_ID_GMFMAP = "gmfmap"; //$NON-NLS-1$
>+	private static final String PAGE_ID_GMFMAP_DIAGNOSTIC = "gmfmap_diagnostic"; //$NON-NLS-1$
> 	private static final String PAGE_ID_TRANSFORM = "transform"; //$NON-NLS-1$
> 	
> 	private IStructuredSelection mySelection;
> 
> 	private GMFGenNewFileCreationPage newFileCreationPage;
> 	private MapModelConfigurationPage mapModelPage;
>+	private MapModelDiagnosticPage mapDiagnosticPage;
> 	private GenModelConfigurationPage genModelPage;
> 	private ViewmapProducerWizardPage transformOptionPage;
> 	
>+	private WizardPage myErrorContainer;
>+	
> 	private TransformToGenModelOperation myOperation;
> 
> 	ResourceSet resourceSet;
>@@ -76,6 +81,11 @@
> 		mapModelPage.setPageComplete(false);
> 		mapModelPage.setModelRequired(true);
> 		addPage(mapModelPage);
>+		
>+		mapDiagnosticPage = new MapModelDiagnosticPage(PAGE_ID_GMFMAP_DIAGNOSTIC);
>+		mapDiagnosticPage.setTitle(Messages.TransformToGenModelWizard_title_mapdiagnostic);
>+		mapDiagnosticPage.setDescription(Messages.TransformToGenModelWizard_descr_mapdiagnostic);
>+		addPage(mapDiagnosticPage);
> 
> 		genModelPage = new GenModelConfigurationPage(PAGE_ID_GENMODEL, rlp, resourceSet);
> 		genModelPage.setTitle(Messages.TransformToGenModelWizard_title_genmodel);
>@@ -97,19 +107,37 @@
> 	 */
> 	@Override
> 	public IWizardPage getNextPage(IWizardPage page) {
>+		//clear error message
>+		if (myErrorContainer != null) {
>+			myErrorContainer.setErrorMessage(null);
>+			myErrorContainer = null;
>+		}
> 		if (page == mapModelPage) {
>-			try {
>-				GenModel genmmodel = getTransformOperation().findGenmodel(resourceSet);
>-				if (genmmodel == null) {
>-					genModelPage.setPageComplete(true);
>-					return transformOptionPage;
>-				}
>-			} catch (CoreException e) {
>-				genModelPage.setStatusMessage(e.getStatus());
>+			Diagnostic diagnostic = getTransformOperation().getMapmodelValidationResult();
>+			if (Diagnostic.ERROR == diagnostic.getSeverity()) {
>+				//init genModelPage anyway
>+				findNextPageAfterMapping();
>+				return mapDiagnosticPage;
> 			}
>+			return findNextPageAfterMapping();
>+		} else if (page == mapDiagnosticPage) {
>+			return findNextPageAfterMapping();
> 		}
> 		return super.getNextPage(page);
> 	}
>+
>+	private IWizardPage findNextPageAfterMapping() {
>+		try {
>+			GenModel genmmodel = getTransformOperation().findGenmodel(resourceSet);
>+			if (genmmodel == null) {
>+				genModelPage.setPageComplete(true);
>+				return transformOptionPage;
>+			}
>+		} catch (CoreException e) {
>+			genModelPage.setStatusMessage(e.getStatus());
>+		}
>+		return genModelPage;
>+	}
> 	
> 	public void init(IWorkbench workbench, IStructuredSelection selection) {
> 		this.mySelection = selection;
>@@ -139,13 +167,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);
>@@ -190,7 +217,8 @@
> 		WizardDialog wd = (WizardDialog) getContainer();
> 		WizardPage wp = (WizardPage) wd.getCurrentPage();
> 		if (wp != null) {
>-			wp.setErrorMessage(message);
>+			myErrorContainer = wp;
>+			myErrorContainer.setErrorMessage(message);
> 		}
> 	}
> 
>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	7 Mar 2007 12:11:09 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.resource.ResourceSet;
> import org.eclipse.gmf.internal.common.ui.ResourceLocationProvider;
>@@ -50,11 +51,12 @@
> 	@Override
> 	protected void resourceChanged() {
> 		super.resourceChanged();
>-		IStatus load = getOperation().getLoadMappingStatus();
>+		Diagnostic load = getOperation().getMapmodelValidationResult();
> 		if (load != null) {
> 			if ((load.getSeverity() == IStatus.WARNING) || (load.getSeverity() == IStatus.INFO) ) {
>-				setStatusMessage(load);
>+				setStatusMessage(TransformToGenModelOperation.getFirst(load));
> 			}
> 		}
> 	}
>+
> }
>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	7 Mar 2007 12:11:10 -0000
>@@ -31,8 +31,12 @@
> 
> 	public static String GMFGenNewFileCreationPage_e_filename;
> 
>+	public static String MapModelDiagnosticPage_btn_ignore_text;
>+
> 	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;
>@@ -69,18 +73,20 @@
> 
> 	public static String TransformToGenModelWizard_descr_gmfgen;
> 
>+	public static String TransformToGenModelWizard_descr_mapdiagnostic;
>+
> 	public static String TransformToGenModelWizard_descr_mapmodel;
> 
> 	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;
> 
> 	public static String TransformToGenModelWizard_title_gmfgen;
> 
>+	public static String TransformToGenModelWizard_title_mapdiagnostic;
>+
> 	public static String TransformToGenModelWizard_title_mapmodel;
> 
> 	public static String TransformToGenModelWizard_title_options;
>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	7 Mar 2007 12:11:10 -0000
>@@ -13,12 +13,14 @@
> 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 ...
> TransformToGenModelWizard_title_mapmodel=Select Mapping Model
>+TransformToGenModelWizard_title_mapdiagnostic=Mapping Model Validation Result
> TransformToGenModelWizard_descr_mapmodel=Load Mapping Model
>+TransformToGenModelWizard_descr_mapdiagnostic=Please review Mapping Model validation errors
> TransformToGenModelWizard_title_genmodel=Select GenModel
> TransformToGenModelWizard_descr_genmodel=Load GenModel or create new one
> TransformToGenModelOperation_e_genmodel_load=Failed to load GenModel
>@@ -40,6 +42,8 @@
> GenModelConfigurationPage_btn_refresh_stale=Refresh stale GenModel...
> GMFGenNewFileCreationPage_e_filename=The file name must end in ".{0}"
> 
>+MapModelDiagnosticPage_btn_ignore_text=Ignore validation errors
>+
> #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.
>Index: src/org/eclipse/gmf/internal/bridge/transform/MapModelDiagnosticPage.java
>===================================================================
>RCS file: src/org/eclipse/gmf/internal/bridge/transform/MapModelDiagnosticPage.java
>diff -N src/org/eclipse/gmf/internal/bridge/transform/MapModelDiagnosticPage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/gmf/internal/bridge/transform/MapModelDiagnosticPage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,108 @@
>+/**
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are 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:
>+ *    Alexander Fedorov (Borland) - initial API and implementation
>+ */
>+package org.eclipse.gmf.internal.bridge.transform;
>+
>+import org.eclipse.emf.common.ui.DiagnosticComposite;
>+import org.eclipse.emf.common.util.Diagnostic;
>+import org.eclipse.jface.wizard.WizardPage;
>+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 MapModelDiagnosticPage extends WizardPage {
>+	
>+	private DiagnosticComposite myDiagnosticComposite;
>+	private Button myIgnoreButton;
>+
>+
>+	MapModelDiagnosticPage(String pageName) {
>+		super(pageName);
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
>+	 */
>+	public void createControl(Composite parent) {
>+		Composite plate = new Composite(parent, SWT.NONE);
>+		{
>+			GridLayout layout = new GridLayout();
>+			plate.setLayout(layout);
>+
>+			GridData data = new GridData();
>+			data.verticalAlignment = GridData.FILL;
>+			data.horizontalAlignment = GridData.FILL;
>+			data.grabExcessHorizontalSpace = true;
>+			plate.setLayoutData(data);
>+		}
>+		createDiagnosticComposite(plate);
>+		createIgnoreButton(plate);
>+		setControl(plate);
>+
>+	}
>+
>+	private void createDiagnosticComposite(Composite parent) {
>+		myDiagnosticComposite = new DiagnosticComposite(parent, SWT.NONE);
>+		myDiagnosticComposite.initialize(null);
>+		myDiagnosticComposite.setShowRootDiagnostic(true);
>+		myDiagnosticComposite.setSeverityMask(Diagnostic.ERROR);
>+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
>+		myDiagnosticComposite.setLayoutData(data);
>+	}
>+	
>+	private void createIgnoreButton(Composite parent) {
>+		myIgnoreButton = new Button(parent, SWT.CHECK);
>+		myIgnoreButton.setText(Messages.MapModelDiagnosticPage_btn_ignore_text);
>+		setButtonLayoutData(myIgnoreButton);
>+		myIgnoreButton.addSelectionListener(new SelectionAdapter(){
>+			
>+			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
>+				applyValidation();
>+			}
>+			
>+		});
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
>+	 */
>+	@Override
>+	public void setVisible(boolean visible) {
>+		if (visible) {
>+			initControls();
>+		}
>+		super.setVisible(visible);
>+	}
>+	
>+	private void initControls() {
>+		TransformToGenModelOperation o = getOperation();
>+		Diagnostic diagnostic = o.getMapmodelValidationResult();
>+		myDiagnosticComposite.setDiagnostic(diagnostic);
>+		boolean ignore = o.getOptions().getIgnoreMapModelValidation();
>+		myIgnoreButton.setSelection(ignore);
>+		setPageComplete(ignore);
>+	}
>+
>+	TransformToGenModelOperation getOperation() {
>+		TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
>+		return wizard.getTransformOperation();
>+	}
>+	
>+	void applyValidation() {
>+		boolean ignore = myIgnoreButton.getSelection();
>+		getOperation().getOptions().setIgnoreMapModelValidation(ignore);
>+		setPageComplete(ignore);
>+	}
>+}
>#P org.eclipse.gmf.tests
>Index: src/org/eclipse/gmf/tests/tr/TransformToGenModelOperationTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/TransformToGenModelOperationTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 TransformToGenModelOperationTest.java
>--- src/org/eclipse/gmf/tests/tr/TransformToGenModelOperationTest.java	7 Feb 2007 12:11:11 -0000	1.1
>+++ src/org/eclipse/gmf/tests/tr/TransformToGenModelOperationTest.java	7 Mar 2007 12:11:11 -0000
>@@ -23,6 +23,7 @@
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
>+import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.Resource;
>@@ -91,9 +92,9 @@
> 			myOperation.loadMappingModel(myRS, toolURI, null);
> 			fail("Invalid MappingModel should not be accepted");
> 		} catch (CoreException e) {
>-			IStatus loadStatus = myOperation.getLoadMappingStatus();
>-			assertNotNull("Load MappingModel status should be set", loadStatus);
>-			assertFalse("Load MappingModel status should differ from OK value", IStatus.OK == loadStatus.getSeverity());
>+			Diagnostic validationResult = myOperation.getMapmodelValidationResult();
>+			assertNotNull("MappingModel validation result should be set", validationResult);
>+			assertFalse("Load MappingModel status should differ from OK value", IStatus.OK == validationResult.getSeverity());
> 			assertNull("GenModelDetector should be reset", myOperation.getGenModelDetector());
> 			assertNull("GenModel should be reset", myOperation.getGenModel());
> 		}
>@@ -177,10 +178,10 @@
> 		try {
> 			mapping = myOperation.loadMappingModel(myRS, mapURI, null);
> 			assertNotNull("Mapping should be resolved", mapping);
>-			IStatus loadStatus = myOperation.getLoadMappingStatus();
>-			assertNotNull("Load MappingModel status should be set", loadStatus);
>-			assertFalse("Load MappingModel status should differ from CANCEL value", IStatus.CANCEL == loadStatus.getSeverity());
>-			assertFalse("Load MappingModel status should differ from ERROR value", IStatus.ERROR == loadStatus.getSeverity());
>+			Diagnostic validationResult = myOperation.getMapmodelValidationResult();
>+			assertNotNull("MappingModel validation result should be set", validationResult);
>+			assertFalse("MappingModel validation result should differ from CANCEL value", IStatus.CANCEL == validationResult.getSeverity());
>+			assertFalse("MappingModel validation result should differ from ERROR value", IStatus.ERROR == validationResult.getSeverity());
> 			assertNotNull("GenModelDetector should be initialized", myOperation.getGenModelDetector());
> 			assertNull("GenModel should be reset", myOperation.getGenModel());
> 		} catch (CoreException e) {

Actions: View | Diff

Attachments on bug 175837: 60134 | 60367