1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 08:13:50 +02:00

[cleanup] fix compiler warnings

This commit is contained in:
Javier Montalvo Orus 2006-12-05 11:04:43 +00:00
parent 472021f819
commit 324cc0f188
8 changed files with 58 additions and 58 deletions

View file

@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin { public class Activator extends AbstractUIPlugin {
// The plug-in ID // 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 // The shared instance
private static Activator plugin; private static Activator plugin;

View file

@ -35,21 +35,21 @@ public interface ModelPackage extends EPackage {
* *
* @generated * @generated
*/ */
String eNAME = "model"; String eNAME = "model"; //$NON-NLS-1$
/** /**
* The package namespace URI. * The package namespace URI.
* *
* @generated * @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. * The package namespace name.
* *
* @generated * @generated
*/ */
String eNS_PREFIX = "model"; String eNS_PREFIX = "model"; //$NON-NLS-1$
/** /**
* The singleton instance of the package. * The singleton instance of the package.

View file

@ -247,9 +247,9 @@ public class DeviceImpl extends EObjectImpl implements Device {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuffer result = new StringBuffer(super.toString());
result.append(" (address: "); result.append(" (address: "); //$NON-NLS-1$
result.append(address); result.append(address);
result.append(", name: "); result.append(", name: "); //$NON-NLS-1$
result.append(name); result.append(name);
result.append(')'); result.append(')');
return result.toString(); return result.toString();

View file

@ -34,7 +34,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
*/ */
public static ModelFactory init() { public static ModelFactory init() {
try { 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) { if (theModelFactory != null) {
return theModelFactory; return theModelFactory;
} }
@ -66,7 +66,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
case ModelPackage.SERVICE: return createService(); case ModelPackage.SERVICE: return createService();
case ModelPackage.SERVICE_TYPE: return createServiceType(); case ModelPackage.SERVICE_TYPE: return createServiceType();
default: 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$
} }
} }

View file

@ -325,25 +325,25 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
// Add supertypes to classes // Add supertypes to classes
// Initialize classes and features; add operations and parameters // Initialize classes and features; add operations and parameters
initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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 // Create resource
createResource(eNS_URI); createResource(eNS_URI);
@ -359,111 +359,111 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
* @generated * @generated
*/ */
protected void createExtendedMetaDataAnnotations() { 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 addAnnotation
(deviceEClass, (deviceEClass,
source, source,
new String[] { new String[] {
"name", "Device", "name", "Device", //$NON-NLS-1$ //$NON-NLS-2$
"kind", "elementOnly" "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getDevice_ServiceType(), (getDevice_ServiceType(),
source, source,
new String[] { new String[] {
"kind", "element", "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
"name", "ServiceType" "name", "ServiceType" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getDevice_Address(), (getDevice_Address(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "address" "name", "address" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getDevice_Name(), (getDevice_Name(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "name" "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(networkEClass, (networkEClass,
source, source,
new String[] { new String[] {
"name", "Network", "name", "Network", //$NON-NLS-1$ //$NON-NLS-2$
"kind", "elementOnly" "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getNetwork_Device(), (getNetwork_Device(),
source, source,
new String[] { new String[] {
"kind", "element", "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
"name", "Device" "name", "Device" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(pairEClass, (pairEClass,
source, source,
new String[] { new String[] {
"name", "Pair", "name", "Pair", //$NON-NLS-1$ //$NON-NLS-2$
"kind", "empty" "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getPair_Key(), (getPair_Key(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "key" "name", "key" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getPair_Value(), (getPair_Value(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "value" "name", "value" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(serviceEClass, (serviceEClass,
source, source,
new String[] { new String[] {
"name", "Service", "name", "Service", //$NON-NLS-1$ //$NON-NLS-2$
"kind", "elementOnly" "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getService_Pair(), (getService_Pair(),
source, source,
new String[] { new String[] {
"kind", "element", "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
"name", "Pair" "name", "Pair" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getService_Name(), (getService_Name(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "name" "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(serviceTypeEClass, (serviceTypeEClass,
source, source,
new String[] { new String[] {
"name", "ServiceType", "name", "ServiceType", //$NON-NLS-1$ //$NON-NLS-2$
"kind", "elementOnly" "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getServiceType_Service(), (getServiceType_Service(),
source, source,
new String[] { new String[] {
"kind", "element", "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
"name", "Service" "name", "Service" //$NON-NLS-1$ //$NON-NLS-2$
}); });
addAnnotation addAnnotation
(getServiceType_Name(), (getServiceType_Name(),
source, source,
new String[] { new String[] {
"kind", "attribute", "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
"name", "name" "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
}); });
} }

View file

@ -193,9 +193,9 @@ public class PairImpl extends EObjectImpl implements Pair {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuffer result = new StringBuffer(super.toString());
result.append(" (key: "); result.append(" (key: "); //$NON-NLS-1$
result.append(key); result.append(key);
result.append(", value: "); result.append(", value: "); //$NON-NLS-1$
result.append(value); result.append(value);
result.append(')'); result.append(')');
return result.toString(); return result.toString();

View file

@ -199,7 +199,7 @@ public class ServiceImpl extends EObjectImpl implements Service {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: "); result.append(" (name: "); //$NON-NLS-1$
result.append(name); result.append(name);
result.append(')'); result.append(')');
return result.toString(); return result.toString();

View file

@ -199,7 +199,7 @@ public class ServiceTypeImpl extends EObjectImpl implements ServiceType {
if (eIsProxy()) return super.toString(); if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString()); StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: "); result.append(" (name: "); //$NON-NLS-1$
result.append(name); result.append(name);
result.append(')'); result.append(')');
return result.toString(); return result.toString();