Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release new version #54

Merged
merged 6 commits into from
Jul 15, 2024
Merged

release new version #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2fc3b6
adjust indentation of comments
marcadetd Jul 11, 2024
de6d1ae
still some adjustements
marcadetd Jul 11, 2024
c7c2df4
disable formatting in some places
marcadetd Jul 11, 2024
67f5bb5
add ordNb attribute to FCDA
marcadetd Jul 11, 2024
fcf9eb4
Merge pull request #53 from riseclipse/52-add-an-attribute-to-fcda-cl…
marcadetd Jul 11, 2024
059b325
update ref to main
marcadetd Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true
Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit
Bundle-Version: 1.2.10
Bundle-Version: 1.2.11.qualifier
Bundle-ClassPath: .
Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation
Bundle-Localization: plugin
Expand Down
1 change: 1 addition & 0 deletions fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,3 +1307,4 @@ _UI_LN_RefersToControlWithIEDName_feature = Refers To ControlWithIEDName
_UI_AgUuid_type = Ag Uuid
_UI_AgUuid_uuid_feature = Uuid
_UI_AgUuid_templateUuid_feature = Template Uuid
_UI_FCDA_ordNb_feature = Ord Nb
23 changes: 23 additions & 0 deletions ...cl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FCDAItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
addLnInstPropertyDescriptor( object );
addPrefixPropertyDescriptor( object );
addRefersToAbstractDataAttributePropertyDescriptor( object );
addOrdNbPropertyDescriptor( object );
}
return itemPropertyDescriptors;
}
Expand Down Expand Up @@ -265,6 +266,27 @@ protected void addRefersToAbstractDataAttributePropertyDescriptor( Object object
null ) );
}

/**
* This adds a property descriptor for the Ord Nb feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addOrdNbPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_FCDA_ordNb_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_ordNb_feature", "_UI_FCDA_type" ),
SclPackage.eINSTANCE.getFCDA_OrdNb(),
false,
false,
false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
null,
null ) );
}

/**
* This returns FCDA.gif.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -326,6 +348,7 @@ public void notifyChanged( Notification notification ) {
case SclPackage.FCDA__LN_CLASS:
case SclPackage.FCDA__LN_INST:
case SclPackage.FCDA__PREFIX:
case SclPackage.FCDA__ORD_NB:
fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
return;
}
Expand Down
2 changes: 1 addition & 1 deletion fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
Bundle-Version: 1.2.10
Bundle-Version: 1.2.11.qualifier
Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.emf.ecore,
Expand Down
4 changes: 2 additions & 2 deletions fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true
Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl
Bundle-Version: 1.2.10
Bundle-Version: 1.2.11.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand All @@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.annotation,
org.eclipse.jface,
org.apache.commons.lang3,
fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.7,1.3.0)"
fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.11"
Bundle-ActivationPolicy: lazy
7 changes: 4 additions & 3 deletions fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,9 +848,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByControl" ordered="false"
upperBound="-1" eType="#//Control" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Control/RefersToDataSet"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="FCDA" ordered="false" upperBound="-1"
eType="#//FCDA" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//FCDA/ParentDataSet"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="FCDA" upperBound="-1" eType="#//FCDA"
unsettable="true" containment="true" resolveProxies="false" eOpposite="#//FCDA/ParentDataSet"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
unsettable="true"/>
</eClassifiers>
Expand Down Expand Up @@ -941,6 +940,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToAbstractDataAttribute"
ordered="false" upperBound="-1" eType="#//AbstractDataAttribute" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//AbstractDataAttribute/ReferredByFCDA"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ordNb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
changeable="false" volatile="true" transient="true" defaultValueLiteral="-1"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FileHandling" eSuperTypes="#//SclObject">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ftp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
Expand Down
1 change: 1 addition & 0 deletions fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/prefix"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/ParentDataSet"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/RefersToAbstractDataAttribute"/>
<genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/ordNb"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//FileHandling">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FileHandling/ftp"/>
Expand Down
2 changes: 1 addition & 1 deletion fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>io.github.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
<version>1.2.9</version>
<version>1.2.11</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions ...f.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
** are made available under the terms of the Eclipse Public License v2.0
** which accompanies this distribution, and is available at
** https://www.eclipse.org/legal/epl-v20.html
**
**
** This file is part of the RiseClipse tool
**
**
** Contributors:
** Computer Science Department, CentraleSupélec
** EDF R&D
Expand Down Expand Up @@ -122,7 +122,7 @@ public interface DataSet extends UnNaming {
* @see #unsetFCDA()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getDataSet_FCDA()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getParentDataSet
* @model opposite="ParentDataSet" containment="true" unsettable="true" ordered="false"
* @model opposite="ParentDataSet" containment="true" unsettable="true"
* @generated
*/
EList< FCDA > getFCDA();
Expand Down
17 changes: 15 additions & 2 deletions ....edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCDA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
** are made available under the terms of the Eclipse Public License v2.0
** which accompanies this distribution, and is available at
** https://www.eclipse.org/legal/epl-v20.html
**
**
** This file is part of the RiseClipse tool
**
**
** Contributors:
** Computer Science Department, CentraleSupélec
** EDF R&D
Expand Down Expand Up @@ -41,6 +41,7 @@
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getPrefix <em>Prefix</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getParentDataSet <em>Parent Data Set</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getRefersToAbstractDataAttribute <em>Refers To Abstract Data Attribute</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getOrdNb <em>Ord Nb</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getFCDA()
Expand Down Expand Up @@ -537,4 +538,16 @@ public interface FCDA extends SclObject {
*/
boolean isSetRefersToAbstractDataAttribute();

/**
* Returns the value of the '<em><b>Ord Nb</b></em>' attribute.
* The default value is <code>"-1"</code>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Ord Nb</em>' attribute.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getFCDA_OrdNb()
* @model default="-1" transient="true" changeable="false" volatile="true"
* @generated
*/
int getOrdNb();

} // FCDA
22 changes: 21 additions & 1 deletion ...iseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11433,14 +11433,23 @@ public interface SclPackage extends EPackage {
*/
int FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE = SCL_OBJECT_FEATURE_COUNT + 9;

/**
* The feature id for the '<em><b>Ord Nb</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FCDA__ORD_NB = SCL_OBJECT_FEATURE_COUNT + 10;

/**
* The number of structural features of the '<em>FCDA</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FCDA_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 10;
int FCDA_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 11;

/**
* The operation id for the '<em>Build Explicit Links</em>' operation.
Expand Down Expand Up @@ -28590,6 +28599,17 @@ public interface SclPackage extends EPackage {
*/
EReference getFCDA_RefersToAbstractDataAttribute();

/**
* Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getOrdNb <em>Ord Nb</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Ord Nb</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getOrdNb()
* @see #getFCDA()
* @generated
*/
EAttribute getFCDA_OrdNb();

/**
* Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FileHandling <em>File Handling</em>}'.
* <!-- begin-user-doc -->
Expand Down
26 changes: 15 additions & 11 deletions ...cl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataAttributeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,6 +1529,8 @@ public String toString() {

@Override
protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
//@formatter:off

console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
"AbstractDataAttributeImpl.doBuildExplicitLinks()" );

Expand All @@ -1549,18 +1551,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
if( !( "Enum".equals( getBType() ) || "Struct".equals( getBType() ) ) ) {
return;
}
// String messagePrefix = "while resolving link from AbstractDataAttribute: ";
// String messagePrefix = "while resolving link from AbstractDataAttribute: ";

if( ( getType() == null ) || getType().isEmpty() ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "type is missing" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "type is missing" );
return;
}

DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates();
if( dtt == null ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "DataTypeTemplates is missing" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "DataTypeTemplates is missing" );
return;
}

Expand All @@ -1575,9 +1577,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
.collect( Collectors.toList() );

if( res.size() != 1 ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " EnumType( id = ", getType(), " )" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " EnumType( id = ", getType(), " )" );
return;
}
setRefersToEnumType( res.get( 0 ) );
Expand All @@ -1596,16 +1598,18 @@ else if( "Struct".equals( getBType() ) ) {
.collect( Collectors.toList() );

if( res.size() != 1 ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " DAType( id = ", getType(), " )" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " DAType( id = ", getType(), " )" );
return;
}
setRefersToDAType( res.get( 0 ) );
console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
"AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ",
getRefersToDAType().getLineNumber() );
}

//@formatter:on
}

} //AbstractDataAttributeImpl
22 changes: 11 additions & 11 deletions ...lipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,17 +1511,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
// lnClass The LN class according to IEC 61850-7-x
// inst The LN instance number identifying this LN – an unsigned integer

// String messagePrefix = "while resolving link from AnyLN on line: ";
// String messagePrefix = "while resolving link from AnyLN on line: ";

if( ( getLnType() == null ) || getLnType().isEmpty() ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "lnType is missing" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "lnType is missing" );
return;
}
DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates();
if( dtt == null ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "DataTypeTemplates is missing" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "DataTypeTemplates is missing" );
return;
}

Expand All @@ -1532,9 +1532,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
.collect( Collectors.toList() );

if( res.size() != 1 ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " LNodeType( id = ", getLnType(), " )" );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ),
// " LNodeType( id = ", getLnType(), " )" );
return;
}
setRefersToLNodeType( res.get( 0 ) );
Expand All @@ -1543,9 +1543,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) {
" ) on line ", getRefersToLNodeType().getLineNumber() );

if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) {
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ",
// getRefersToLNodeType().getLnClass(), " and not ", getLnClass() );
// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(),
// messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ",
// getRefersToLNodeType().getLnClass(), " and not ", getLnClass() );
}
}

Expand Down
Loading
Loading