mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 07:35:24 +02:00
Code Issues Wiki Activity

[cleanup] fix compiler warnings

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java
View file

@ -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;

6
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java
View file

@ -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.

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java
View file

@ -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();

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java
View file

@ -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$
}
}

92
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java
View file

@ -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$
});
}

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java
View file

@ -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();

2
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java
View file

@ -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();

2
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java
View file

@ -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();