Commit bd65dc92 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '59-update-to-epl-2-0' into 'master'

Resolve "update to EPL 2.0"

Closes #59

See merge request !54
parents 49be24b6 19c5497a
Pipeline #1624 passed with stages
in 31 seconds
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
# Copyright (c) 2018 CentraleSuplec & EDF.
# 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
#
# This file is part of the RiseClipse tool
#
# Contributors:
# Computer Science Department, CentraleSuplec
# EDF R&D
# Contacts:
# dominique.marcadet@centralesupelec.fr
# aurelie.dehouck-neveu@edf.fr
# Web site:
# http://wdi.supelec.fr/software/RiseClipse/
# *************************************************************************
# ** Copyright (c) 2019 CentraleSuplec & EDF.
# ** All rights reserved. This program and the accompanying materials
# ** 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, CentraleSuplec
# ** EDF R&D
# ** Contacts:
# ** dominique.marcadet@centralesupelec.fr
# ** aurelie.dehouck-neveu@edf.fr
# ** Web site:
# ** http://wdi.supelec.fr/software/RiseClipse/
# *************************************************************************
bin.includes = .,\
icons/,\
......
# Copyright (c) 2018 CentraleSuplec & EDF.
# 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
#
# This file is part of the RiseClipse tool
#
# Contributors:
# Computer Science Department, CentraleSuplec
# EDF R&D
# Contacts:
# dominique.marcadet@centralesupelec.fr
# aurelie.dehouck-neveu@edf.fr
# Web site:
# http://wdi.supelec.fr/software/RiseClipse/
# *************************************************************************
# ** Copyright (c) 2019 CentraleSuplec & EDF.
# ** All rights reserved. This program and the accompanying materials
# ** 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, CentraleSuplec
# ** EDF R&D
# ** Contacts:
# ** dominique.marcadet@centralesupelec.fr
# ** aurelie.dehouck-neveu@edf.fr
# ** Web site:
# ** http://wdi.supelec.fr/software/RiseClipse/
# *************************************************************************
pluginName = RiseClipse IEC 61850 SCL Edit Support
providerName = CentraleSuplec & EDF
......
......@@ -2,22 +2,24 @@
<?eclipse version="3.0"?>
<!--
Copyright (c) 2018 CentraleSupélec & EDF.
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
This file is part of the RiseClipse tool
Contributors:
Computer Science Department, CentraleSupélec
EDF R&D
Contacts:
dominique.marcadet@centralesupelec.fr
aurelie.dehouck-neveu@edf.fr
Web site:
http://wdi.supelec.fr/software/RiseClipse/
*************************************************************************
** Copyright (c) 2019 CentraleSupélec & EDF.
** All rights reserved. This program and the accompanying materials
** 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
** Contacts:
** dominique.marcadet@centralesupelec.fr
** aurelie.dehouck-neveu@edf.fr
** Web site:
** http://wdi.supelec.fr/software/RiseClipse/
*************************************************************************
-->
<plugin>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<!--
*************************************************************************
** Copyright (c) 2019 CentraleSupélec & EDF.
** All rights reserved. This program and the accompanying materials
** 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
** Contacts:
** dominique.marcadet@centralesupelec.fr
** aurelie.dehouck-neveu@edf.fr
** Web site:
** http://wdi.supelec.fr/software/RiseClipse/
*************************************************************************
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
......
/**
* Copyright (c) 2018 CentraleSupélec & EDF.
* 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
*
* This file is part of the RiseClipse tool
*
* Contributors:
* Computer Science Department, CentraleSupélec
* EDF R&D
* Contacts:
* dominique.marcadet@centralesupelec.fr
* aurelie.dehouck-neveu@edf.fr
* Web site:
* http://wdi.supelec.fr/software/RiseClipse/
*/
/*
*************************************************************************
** Copyright (c) 2019 CentraleSupélec & EDF.
** All rights reserved. This program and the accompanying materials
** 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
** Contacts:
** dominique.marcadet@centralesupelec.fr
** aurelie.dehouck-neveu@edf.fr
** Web site:
** http://wdi.supelec.fr/software/RiseClipse/
*************************************************************************
*/
package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
......@@ -44,8 +45,8 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* <!-- end-user-doc -->
* @generated
*/
public AbstractConductingEquipmentItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
public AbstractConductingEquipmentItemProvider( AdapterFactory adapterFactory ) {
super( adapterFactory );
}
/**
......@@ -55,9 +56,9 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
if( itemPropertyDescriptors == null ) {
super.getPropertyDescriptors( object );
}
return itemPropertyDescriptors;
......@@ -72,11 +73,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment());
childrenFeatures.add(SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal());
public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
if( childrenFeatures == null ) {
super.getChildrenFeatures( object );
childrenFeatures.add( SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment() );
childrenFeatures.add( SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal() );
}
return childrenFeatures;
}
......@@ -87,11 +88,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
protected EStructuralFeature getChildFeature( Object object, Object child ) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
return super.getChildFeature(object, child);
return super.getChildFeature( object, child );
}
/**
......@@ -101,8 +102,8 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractConductingEquipment"));
public Object getImage( Object object ) {
return overlayImage( object, getResourceLocator().getImage( "full/obj16/AbstractConductingEquipment" ) );
}
/**
......@@ -112,13 +113,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
public String getText(Object object) {
String label = ((AbstractConductingEquipment)object).getName();
return label == null || label.length() == 0 ?
getString("_UI_AbstractConductingEquipment_type") :
getString("_UI_AbstractConductingEquipment_type") + " " + label;
public String getText( Object object ) {
String label = ( ( AbstractConductingEquipment ) object ).getName();
return label == null || label.length() == 0 ? getString( "_UI_AbstractConductingEquipment_type" )
: getString( "_UI_AbstractConductingEquipment_type" ) + " " + label;
}
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
......@@ -128,16 +127,16 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
switch (notification.getFeatureID(AbstractConductingEquipment.class)) {
case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
public void notifyChanged( Notification notification ) {
updateChildren( notification );
switch( notification.getFeatureID( AbstractConductingEquipment.class ) ) {
case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL: