Skip to content

Commit

Permalink
Merge pull request #41 from riseclipse/develop
Browse files Browse the repository at this point in the history
prepare release
  • Loading branch information
marcadetd authored Mar 27, 2024
2 parents 47728ab + f7ed9b9 commit 11c4252
Show file tree
Hide file tree
Showing 160 changed files with 5,872 additions and 2,221 deletions.
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.7
Bundle-Version: 1.2.8.qualifier
Bundle-ClassPath: .
Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation
Bundle-Localization: plugin
Expand Down
491 changes: 248 additions & 243 deletions fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand All @@ -27,8 +27,6 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessControl;

/**
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessControl} object.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -77,13 +75,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( AccessControl ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_AccessControl_type" )
: getString( "_UI_AccessControl_type" ) + " " + label;
return getText( object, getString( "_UI_AccessControl_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -111,13 +111,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( Address ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_Address_type" )
: getString( "_UI_Address_type" ) + " " + label;
return getText( object, getString( "_UI_Address_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/**
* Copyright (c) 2016-2024 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:
* [email protected]
* [email protected]
* Web site:
* https://riseclipse.github.io/
*
*/
package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;

import java.util.Collection;
import java.util.List;

import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;

import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgUuid;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;

/**
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgUuid} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public class AgUuidItemProvider
extends ItemProviderAdapter
implements
IEditingDomainItemProvider,
IStructuredItemContentProvider,
ITreeItemContentProvider,
IItemLabelProvider,
IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public AgUuidItemProvider( AdapterFactory adapterFactory ) {
super( adapterFactory );
}

/**
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
if( itemPropertyDescriptors == null ) {
super.getPropertyDescriptors( object );

addUuidPropertyDescriptor( object );
addTemplateUuidPropertyDescriptor( object );
}
return itemPropertyDescriptors;
}

/**
* This adds a property descriptor for the Uuid feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addUuidPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_AgUuid_uuid_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_AgUuid_uuid_feature", "_UI_AgUuid_type" ),
SclPackage.eINSTANCE.getAgUuid_Uuid(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null ) );
}

/**
* This adds a property descriptor for the Template Uuid feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addTemplateUuidPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_AgUuid_templateUuid_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_AgUuid_templateUuid_feature",
"_UI_AgUuid_type" ),
SclPackage.eINSTANCE.getAgUuid_TemplateUuid(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null ) );
}

/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText( Object object ) {
String label = ( ( AgUuid ) object ).getUuid();
return label == null || label.length() == 0 ? getString( "_UI_AgUuid_type" )
: getString( "_UI_AgUuid_type" ) + " " + label;
}

/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged( Notification notification ) {
updateChildren( notification );

switch( notification.getFeatureID( AgUuid.class ) ) {
case SclPackage.AG_UUID__UUID:
case SclPackage.AG_UUID__TEMPLATE_UUID:
fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
return;
}
super.notifyChanged( notification );
}

/**
* This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
super.collectNewChildDescriptors( newChildDescriptors, object );
}

/**
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public ResourceLocator getResourceLocator() {
return SCLEditPlugin.INSTANCE;
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -103,13 +103,11 @@ protected EStructuralFeature getChildFeature( Object object, Object child ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( AnyContentFromOtherNamespace ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_AnyContentFromOtherNamespace_type" )
: getString( "_UI_AnyContentFromOtherNamespace_type" ) + " " + label;
return getText( object, getString( "_UI_AnyContentFromOtherNamespace_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -322,13 +322,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( AnyLN ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_AnyLN_type" )
: getString( "_UI_AnyLN_type" ) + " " + label;
return getText( object, getString( "_UI_AnyLN_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -286,13 +286,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( Association ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_Association_type" )
: getString( "_UI_Association_type" ) + " " + label;
return getText( object, getString( "_UI_Association_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -200,7 +200,7 @@ public Object getImage( Object object ) {
*/
@Override
public String getText( Object object ) {
return getString( "_UI_Authentication_type" );
return getText( object, getString( "_UI_Authentication_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -114,13 +114,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( BaseElement ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_BaseElement_type" )
: getString( "_UI_BaseElement_type" ) + " " + label;
return getText( object, getString( "_UI_BaseElement_type" ) );
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*************************************************************************
** Copyright (c) 2016-2021 CentraleSupélec & EDF.
** Copyright (c) 2016-2024 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
Expand Down Expand Up @@ -150,13 +150,11 @@ public Object getImage( Object object ) {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public String getText( Object object ) {
String label = ( ( BitRateInMbPerSec ) object ).getFilename();
return label == null || label.length() == 0 ? getString( "_UI_BitRateInMbPerSec_type" )
: getString( "_UI_BitRateInMbPerSec_type" ) + " " + label;
return getText( object, getString( "_UI_BitRateInMbPerSec_type" ) );
}

/**
Expand Down
Loading

0 comments on commit 11c4252

Please sign in to comment.