Commit 6765e277 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '26-some-ocl-messages-are-displayed-multiple-times' into 'master'

Resolve "some OCL messages are displayed multiple times"

Closes #26

See merge request !29
parents 4df64afa ff4cb805
Pipeline #5170 passed with stages
in 41 seconds
## 1.1.0a18 (2020/02/19)
- solve multiple displays of OCL messages (issue #26)
- use of FeatureMap in SCL metamodel removed (issue riseclipse-metamodel-scl2003#63)
## 1.1.0a17 (2020/02/12)
- add explicit links for LDevice hierarchy using GrRef (issue riseclipse-metamodel-scl2003#46)
- validation of enumeration revisited (issue #23)
......
......@@ -22,6 +22,7 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl.validator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
......@@ -41,6 +42,7 @@ import fr.centralesupelec.edf.riseclipse.validation.ocl.OCLValidator;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
......@@ -49,6 +51,7 @@ import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.Diagnostician;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.pivot.validation.ComposedEValidator;
......@@ -420,6 +423,12 @@ public class RiseClipseValidatorSCL {
}
});
});
for( TreeIterator< ? extends EObject > t = EcoreUtil.getAllContents( Collections.singleton( scl ) ); t.hasNext(); ) {
EObject child = t.next();
console.info( child.getClass().getName() );
}
}
System.exit( 0 );
......@@ -445,7 +454,7 @@ public class RiseClipseValidatorSCL {
console.info( "Web site:" );
console.info( " http://wdi.supelec.fr/software/RiseClipse/" );
console.info( "" );
console.info( "RiseClipseValidatorSCL version: 1.1.0 a17 (12 February 2020)" );
console.info( "RiseClipseValidatorSCL version: 1.1.0 a18 (19 February 2020)" );
console.info( "" );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment