From 324cc0f188ed5e21bd1f621a538ffa985811a460 Mon Sep 17 00:00:00 2001 From: Javier Montalvo Orus Date: Tue, 5 Dec 2006 11:04:43 +0000 Subject: [PATCH] [cleanup] fix compiler warnings --- .../eclipse/tm/discovery/model/Activator.java | 2 +- .../tm/discovery/model/ModelPackage.java | 6 +- .../tm/discovery/model/impl/DeviceImpl.java | 4 +- .../model/impl/ModelFactoryImpl.java | 4 +- .../model/impl/ModelPackageImpl.java | 92 +++++++++---------- .../tm/discovery/model/impl/PairImpl.java | 4 +- .../tm/discovery/model/impl/ServiceImpl.java | 2 +- .../discovery/model/impl/ServiceTypeImpl.java | 2 +- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java index ff3296716db..48182efd041 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java @@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.tm.discovery"; + public static final String PLUGIN_ID = "org.eclipse.tm.discovery"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java index 77e4807a72a..1d7cb84ffcd 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java @@ -35,21 +35,21 @@ public interface ModelPackage extends EPackage { * * @generated */ - String eNAME = "model"; + String eNAME = "model"; //$NON-NLS-1$ /** * The package namespace URI. * * @generated */ - String eNS_URI = "http://www.eclipse.org/tm/discovery/model"; + String eNS_URI = "http://www.eclipse.org/tm/discovery/model"; //$NON-NLS-1$ /** * The package namespace name. * * @generated */ - String eNS_PREFIX = "model"; + String eNS_PREFIX = "model"; //$NON-NLS-1$ /** * The singleton instance of the package. diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java index 9d24f9e0ac8..6b505077501 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java @@ -247,9 +247,9 @@ public class DeviceImpl extends EObjectImpl implements Device { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (address: "); + result.append(" (address: "); //$NON-NLS-1$ result.append(address); - result.append(", name: "); + result.append(", name: "); //$NON-NLS-1$ result.append(name); result.append(')'); return result.toString(); diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java index 126bfa0cbf5..0fd2fe4bbeb 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java @@ -34,7 +34,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory { */ public static ModelFactory init() { try { - ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/tm/discovery/model"); + ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/tm/discovery/model"); //$NON-NLS-1$ if (theModelFactory != null) { return theModelFactory; } @@ -66,7 +66,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory { case ModelPackage.SERVICE: return createService(); case ModelPackage.SERVICE_TYPE: return createServiceType(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$//$NON-NLS-2$ } } diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java index a4f14325c62..f5b7d955466 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java @@ -325,25 +325,25 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage { // Add supertypes to classes // Initialize classes and features; add operations and parameters - initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDevice_ServiceType(), this.getServiceType(), null, "serviceType", null, 1, -1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getDevice_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getDevice_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getDevice_ServiceType(), this.getServiceType(), null, "serviceType", null, 1, -1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getDevice_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getDevice_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEClass(networkEClass, Network.class, "Network", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getNetwork_Device(), this.getDevice(), null, "device", null, 1, -1, Network.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(networkEClass, Network.class, "Network", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getNetwork_Device(), this.getDevice(), null, "device", null, 1, -1, Network.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEClass(pairEClass, Pair.class, "Pair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPair_Key(), theXMLTypePackage.getString(), "key", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getPair_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(pairEClass, Pair.class, "Pair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getPair_Key(), theXMLTypePackage.getString(), "key", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getPair_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getService_Pair(), this.getPair(), null, "pair", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getService_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getService_Pair(), this.getPair(), null, "pair", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getService_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEClass(serviceTypeEClass, ServiceType.class, "ServiceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getServiceType_Service(), this.getService(), null, "service", null, 1, -1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getServiceType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(serviceTypeEClass, ServiceType.class, "ServiceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getServiceType_Service(), this.getService(), null, "service", null, 1, -1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getServiceType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ // Create resource createResource(eNS_URI); @@ -359,111 +359,111 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage { * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation (deviceEClass, source, new String[] { - "name", "Device", - "kind", "elementOnly" + "name", "Device", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getDevice_ServiceType(), source, new String[] { - "kind", "element", - "name", "ServiceType" + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "ServiceType" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getDevice_Address(), source, new String[] { - "kind", "attribute", - "name", "address" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "address" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getDevice_Name(), source, new String[] { - "kind", "attribute", - "name", "name" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (networkEClass, source, new String[] { - "name", "Network", - "kind", "elementOnly" + "name", "Network", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getNetwork_Device(), source, new String[] { - "kind", "element", - "name", "Device" + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "Device" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (pairEClass, source, new String[] { - "name", "Pair", - "kind", "empty" + "name", "Pair", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getPair_Key(), source, new String[] { - "kind", "attribute", - "name", "key" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "key" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getPair_Value(), source, new String[] { - "kind", "attribute", - "name", "value" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "value" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (serviceEClass, source, new String[] { - "name", "Service", - "kind", "elementOnly" + "name", "Service", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getService_Pair(), source, new String[] { - "kind", "element", - "name", "Pair" + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "Pair" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getService_Name(), source, new String[] { - "kind", "attribute", - "name", "name" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (serviceTypeEClass, source, new String[] { - "name", "ServiceType", - "kind", "elementOnly" + "name", "ServiceType", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getServiceType_Service(), source, new String[] { - "kind", "element", - "name", "Service" + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "Service" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getServiceType_Name(), source, new String[] { - "kind", "attribute", - "name", "name" + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java index 2983859d86d..25aa9ad75c9 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java @@ -193,9 +193,9 @@ public class PairImpl extends EObjectImpl implements Pair { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (key: "); + result.append(" (key: "); //$NON-NLS-1$ result.append(key); - result.append(", value: "); + result.append(", value: "); //$NON-NLS-1$ result.append(value); result.append(')'); return result.toString(); diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java index badc0ce9b27..1f57639ab04 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java @@ -199,7 +199,7 @@ public class ServiceImpl extends EObjectImpl implements Service { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); + result.append(" (name: "); //$NON-NLS-1$ result.append(name); result.append(')'); return result.toString(); diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java index 60e4fbb0e7e..2c7e737014b 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java @@ -199,7 +199,7 @@ public class ServiceTypeImpl extends EObjectImpl implements ServiceType { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); + result.append(" (name: "); //$NON-NLS-1$ result.append(name); result.append(')'); return result.toString();