From bd5036eac08603e7c11b06294bd293a4d8451294 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Tue, 11 Feb 2020 13:09:22 +0100 Subject: [PATCH] use @formatter:off/on and small space changes --- .../scl/provider/EnumValItemProvider.java | 20 +++++++++---------- .../scl/provider/TerminalItemProvider.java | 20 +++++++++---------- .../scl/provider/ValItemProvider.java | 10 +++++----- .../iec61850/scl/impl/AnyLNImpl.java | 2 ++ .../riseclipse/iec61850/scl/impl/DAIImpl.java | 2 +- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java index bc412c9..dbe9a02 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java @@ -112,11 +112,11 @@ public class EnumValItemProvider extends SclObjectItemProvider { } /** - * This adds a property descriptor for the Desc feature. - * - * - * @generated - */ + * This adds a property descriptor for the Desc feature. + * + * + * @generated + */ protected void addDescPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), @@ -133,11 +133,11 @@ public class EnumValItemProvider extends SclObjectItemProvider { } /** - * This returns EnumVal.gif. - * - * - * @generated - */ + * This returns EnumVal.gif. + * + * + * @generated + */ @Override public Object getImage( Object object ) { return overlayImage( object, getResourceLocator().getImage( "full/obj16/EnumVal" ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java index a419a92..e88b59a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java @@ -250,11 +250,11 @@ public class TerminalItemProvider extends UnNamingItemProvider { } /** - * This adds a property descriptor for the Line Name feature. - * - * - * @generated - */ + * This adds a property descriptor for the Line Name feature. + * + * + * @generated + */ protected void addLineNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), @@ -272,11 +272,11 @@ public class TerminalItemProvider extends UnNamingItemProvider { } /** - * This returns Terminal.gif. - * - * - * @generated - */ + * This returns Terminal.gif. + * + * + * @generated + */ @Override public Object getImage( Object object ) { return overlayImage( object, getResourceLocator().getImage( "full/obj16/Terminal" ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java index 08f10c0..6002547 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java @@ -110,11 +110,11 @@ public class ValItemProvider } /** - * This returns Val.gif. - * - * - * @generated - */ + * This returns Val.gif. + * + * + * @generated + */ @Override public Object getImage( Object object ) { return overlayImage( object, getResourceLocator().getImage( "full/obj16/Val" ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java index d2ec31b..1e72dc1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java @@ -1120,6 +1120,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { */ @Override public String getNamespace() { + //@formatter:off List< DOI > namPltDoi = getDOI() .stream() @@ -1196,6 +1197,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { if( getParentLDevice() == null ) return null; return getParentLDevice().getNamespace(); + //@formatter:on } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java index c8e785a..cab8db2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java @@ -1073,7 +1073,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { // No error or warning message here: if this happens, error should have been detected before if( dot == null ) return; console.verbose( messagePrefix, "found DOType on line ", dot.getLineNumber() ); - + List< DA > res = dot .getDA() .stream() -- GitLab