Commit e41cd942 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '16-changes-in-emf-generated-code-in-photon' into 'master'

Resolve "Changes in EMF generated code in Photon"

Closes #16

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!14
parents fb7f94ce 181e9ef4
Manifest-Version: 1.0 Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: RiseClipse IEC 61850 SCL Edit Support Bundle-Name: %pluginName
Bundle-Vendor: CentraleSupélec & EDF Bundle-Vendor: %providerName
Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true
Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit
Bundle-Version: 1.0.2.qualifier Bundle-Version: 1.0.2.qualifier
Bundle-ClassPath: . Bundle-ClassPath: .
Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation
......
Manifest-Version: 1.0 Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: RiseClipse IEC61850 SCL Metamodel Bundle-Name: %pluginName
Bundle-Vendor: CentraleSupélec & EDF Bundle-Vendor: %providerName
Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true
Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl
Bundle-Version: 1.0.2.qualifier Bundle-Version: 1.0.2.qualifier
Bundle-ClassPath: . Bundle-ClassPath: .
Bundle-Localization: plugin Bundle-Localization: plugin
......
...@@ -866,7 +866,7 @@ public abstract class AbstractDataAttributeImpl extends DataAttributeImpl implem ...@@ -866,7 +866,7 @@ public abstract class AbstractDataAttributeImpl extends DataAttributeImpl implem
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (bType: "); result.append(" (bType: ");
if (bTypeESet) result.append(bType); else result.append("<unset>"); if (bTypeESet) result.append(bType); else result.append("<unset>");
result.append(", count: "); result.append(", count: ");
......
...@@ -351,7 +351,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement ...@@ -351,7 +351,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (type: "); result.append(" (type: ");
if (typeESet) result.append(type); else result.append("<unset>"); if (typeESet) result.append(type); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -1311,7 +1311,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint { ...@@ -1311,7 +1311,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (clock: "); result.append(" (clock: ");
if (clockESet) result.append(clock); else result.append("<unset>"); if (clockESet) result.append(clock); else result.append("<unset>");
result.append(", kdc: "); result.append(", kdc: ");
......
...@@ -247,7 +247,7 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp ...@@ -247,7 +247,7 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (mixed: "); result.append(" (mixed: ");
result.append(mixed); result.append(mixed);
result.append(", anyAttribute: "); result.append(", anyAttribute: ");
......
...@@ -1302,7 +1302,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { ...@@ -1302,7 +1302,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (inst: "); result.append(" (inst: ");
if (instESet) result.append(inst); else result.append("<unset>"); if (instESet) result.append(inst); else result.append("<unset>");
result.append(", lnClass: "); result.append(", lnClass: ");
......
...@@ -956,7 +956,7 @@ public class AssociationImpl extends BaseElementImpl implements Association { ...@@ -956,7 +956,7 @@ public class AssociationImpl extends BaseElementImpl implements Association {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (associationID: "); result.append(" (associationID: ");
if (associationIDESet) result.append(associationID); else result.append("<unset>"); if (associationIDESet) result.append(associationID); else result.append("<unset>");
result.append(", iedName: "); result.append(", iedName: ");
......
...@@ -644,7 +644,7 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication ...@@ -644,7 +644,7 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (certificate: "); result.append(" (certificate: ");
if (certificateESet) result.append(certificate); else result.append("<unset>"); if (certificateESet) result.append(certificate); else result.append("<unset>");
result.append(", none: "); result.append(", none: ");
......
...@@ -409,7 +409,7 @@ public abstract class BaseElementImpl extends ExplicitLinkResolverImpl implement ...@@ -409,7 +409,7 @@ public abstract class BaseElementImpl extends ExplicitLinkResolverImpl implement
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (any: "); result.append(" (any: ");
result.append(any); result.append(any);
result.append(", anyAttribute: "); result.append(", anyAttribute: ");
......
...@@ -334,7 +334,7 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP ...@@ -334,7 +334,7 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (value: "); result.append(" (value: ");
result.append(value); result.append(value);
result.append(", multiplier: "); result.append(", multiplier: ");
......
...@@ -288,7 +288,7 @@ public class CertImpl extends SclObjectImpl implements Cert { ...@@ -288,7 +288,7 @@ public class CertImpl extends SclObjectImpl implements Cert {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (commonName: "); result.append(" (commonName: ");
if (commonNameESet) result.append(commonName); else result.append("<unset>"); if (commonNameESet) result.append(commonName); else result.append("<unset>");
result.append(", idHierarchy: "); result.append(", idHierarchy: ");
......
...@@ -578,7 +578,7 @@ public class CertificateImpl extends NamingImpl implements Certificate { ...@@ -578,7 +578,7 @@ public class CertificateImpl extends NamingImpl implements Certificate {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (serialNumber: "); result.append(" (serialNumber: ");
if (serialNumberESet) result.append(serialNumber); else result.append("<unset>"); if (serialNumberESet) result.append(serialNumber); else result.append("<unset>");
result.append(", xferNumber: "); result.append(", xferNumber: ");
......
...@@ -959,7 +959,7 @@ public class ClientLNImpl extends ExplicitLinkResolverImpl implements ClientLN { ...@@ -959,7 +959,7 @@ public class ClientLNImpl extends ExplicitLinkResolverImpl implements ClientLN {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (apRef: "); result.append(" (apRef: ");
if (apRefESet) result.append(apRef); else result.append("<unset>"); if (apRefESet) result.append(apRef); else result.append("<unset>");
result.append(", iedName: "); result.append(", iedName: ");
......
...@@ -1292,7 +1292,7 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices ...@@ -1292,7 +1292,7 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (bufReport: "); result.append(" (bufReport: ");
if (bufReportESet) result.append(bufReport); else result.append("<unset>"); if (bufReportESet) result.append(bufReport); else result.append("<unset>");
result.append(", goose: "); result.append(", goose: ");
......
...@@ -300,7 +300,7 @@ public class CommProtImpl extends SclObjectImpl implements CommProt { ...@@ -300,7 +300,7 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (ipv6: "); result.append(" (ipv6: ");
if (ipv6ESet) result.append(ipv6); else result.append("<unset>"); if (ipv6ESet) result.append(ipv6); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -607,7 +607,7 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp ...@@ -607,7 +607,7 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (type: "); result.append(" (type: ");
if (typeESet) result.append(type); else result.append("<unset>"); if (typeESet) result.append(type); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -386,7 +386,7 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs { ...@@ -386,7 +386,7 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (fixLnInst: "); result.append(" (fixLnInst: ");
if (fixLnInstESet) result.append(fixLnInst); else result.append("<unset>"); if (fixLnInstESet) result.append(fixLnInst); else result.append("<unset>");
result.append(", fixPrefix: "); result.append(", fixPrefix: ");
......
...@@ -300,7 +300,7 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG { ...@@ -300,7 +300,7 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (resvTms: "); result.append(" (resvTms: ");
if (resvTmsESet) result.append(resvTms); else result.append("<unset>"); if (resvTmsESet) result.append(resvTms); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -923,7 +923,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { ...@@ -923,7 +923,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (apName: "); result.append(" (apName: ");
if (apNameESet) result.append(apName); else result.append("<unset>"); if (apNameESet) result.append(apName); else result.append("<unset>");
result.append(", iedName: "); result.append(", iedName: ");
......
...@@ -424,7 +424,7 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti ...@@ -424,7 +424,7 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (pathName: "); result.append(" (pathName: ");
if (pathNameESet) result.append(pathName); else result.append("<unset>"); if (pathNameESet) result.append(pathName); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -724,7 +724,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl ...@@ -724,7 +724,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (cbName: "); result.append(" (cbName: ");
if (cbNameESet) result.append(cbName); else result.append("<unset>"); if (cbNameESet) result.append(cbName); else result.append("<unset>");
result.append(", ldInst: "); result.append(", ldInst: ");
......
...@@ -452,7 +452,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { ...@@ -452,7 +452,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (datSet: "); result.append(" (datSet: ");
if (datSetESet) result.append(datSet); else result.append("<unset>"); if (datSetESet) result.append(datSet); else result.append("<unset>");
result.append(", name: "); result.append(", name: ");
......
...@@ -482,7 +482,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE ...@@ -482,7 +482,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (confRev: "); result.append(" (confRev: ");
if (confRevESet) result.append(confRev); else result.append("<unset>"); if (confRevESet) result.append(confRev); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -360,7 +360,7 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C ...@@ -360,7 +360,7 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (intgPd: "); result.append(" (intgPd: ");
if (intgPdESet) result.append(intgPd); else result.append("<unset>"); if (intgPdESet) result.append(intgPd); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -683,7 +683,7 @@ public class DAIImpl extends DataAttributeImpl implements DAI { ...@@ -683,7 +683,7 @@ public class DAIImpl extends DataAttributeImpl implements DAI {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (ix: "); result.append(" (ix: ");
if (ixESet) result.append(ix); else result.append("<unset>"); if (ixESet) result.append(ix); else result.append("<unset>");
result.append(", sAddr: "); result.append(", sAddr: ");
......
...@@ -781,7 +781,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA { ...@@ -781,7 +781,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (dchg: "); result.append(" (dchg: ");
if (dchgESet) result.append(dchg); else result.append("<unset>"); if (dchgESet) result.append(dchg); else result.append("<unset>");
result.append(", dupd: "); result.append(", dupd: ");
......
...@@ -478,7 +478,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType { ...@@ -478,7 +478,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (iedType: "); result.append(" (iedType: ");
if (iedTypeESet) result.append(iedType); else result.append("<unset>"); if (iedTypeESet) result.append(iedType); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -420,7 +420,7 @@ public class DOIImpl extends DataObjectImpl implements DOI { ...@@ -420,7 +420,7 @@ public class DOIImpl extends DataObjectImpl implements DOI {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (ix: "); result.append(" (ix: ");
if (ixESet) result.append(ix); else result.append("<unset>"); if (ixESet) result.append(ix); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -528,7 +528,7 @@ public class DOImpl extends DataObjectImpl implements DO { ...@@ -528,7 +528,7 @@ public class DOImpl extends DataObjectImpl implements DO {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (transient: "); result.append(" (transient: ");
if (transientESet) result.append(transient_); else result.append("<unset>"); if (transientESet) result.append(transient_); else result.append("<unset>");
result.append(", type: "); result.append(", type: ");
......
...@@ -623,7 +623,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType { ...@@ -623,7 +623,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (cdc: "); result.append(" (cdc: ");
if (cdcESet) result.append(cdc); else result.append("<unset>"); if (cdcESet) result.append(cdc); else result.append("<unset>");
result.append(", iedType: "); result.append(", iedType: ");
......
...@@ -344,7 +344,7 @@ public abstract class DataAttributeImpl extends UnNamingImpl implements DataAttr ...@@ -344,7 +344,7 @@ public abstract class DataAttributeImpl extends UnNamingImpl implements DataAttr
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (name: "); result.append(" (name: ");
if (nameESet) result.append(name); else result.append("<unset>"); if (nameESet) result.append(name); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -434,7 +434,7 @@ public abstract class DataObjectImpl extends UnNamingImpl implements DataObject ...@@ -434,7 +434,7 @@ public abstract class DataObjectImpl extends UnNamingImpl implements DataObject
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (accessControl: "); result.append(" (accessControl: ");
if (accessControlESet) result.append(accessControl); else result.append("<unset>"); if (accessControlESet) result.append(accessControl); else result.append("<unset>");
result.append(", name: "); result.append(", name: ");
......
...@@ -421,7 +421,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet { ...@@ -421,7 +421,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (name: "); result.append(" (name: ");
if (nameESet) result.append(name); else result.append("<unset>"); if (nameESet) result.append(name); else result.append("<unset>");
result.append(')'); result.append(')');
......
...@@ -334,7 +334,7 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM ...@@ -334,7 +334,7 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (value: "); result.append(" (value: ");
result.append(value); result.append(value);
result.append(", multiplier: "); result.append(", multiplier: ");
......
...@@ -438,7 +438,7 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal { ...@@ -438,7 +438,7 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (ord: "); result.append(" (ord: ");
if (ordESet) result.append(ord); else result.append("<unset>"); if (ordESet) result.append(ord); else result.append("<unset>");
result.append(", value: "); result.append(", value: ");
......
...@@ -202,7 +202,7 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment ...@@ -202,7 +202,7 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
public String toString() { public String toString() {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (virtual: "); result.append(" (virtual: ");
if (virtualESet) result.append(virtual); else result.append("<unset>"); if (virtualESet) result.append(virtual); else result.append("<unset>");
result.append(')'); result.append(')');
......