ROO-2446: Post 1.1.4.RELEASE code refactor and clean up - added deact…

…ivate method as per other providers
gavinlau · May 23, 2011 · afef7ca · afef7ca
1 parent 49bab74
commit afef7ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...ain/java/org/springframework/roo/addon/configurable/ConfigurableMetadataProviderImpl.java b/...ain/java/org/springframework/roo/addon/configurable/ConfigurableMetadataProviderImpl.java
@@ -30,6 +30,11 @@ protected void activate(ComponentContext context) {
 		addMetadataTrigger(new JavaType(RooConfigurable.class.getName()));
 	}
 
+	protected void deactivate(ComponentContext context) {
+		metadataDependencyRegistry.deregisterDependency(PhysicalTypeIdentifier.getMetadataIdentiferType(), getProvidesType());
+		removeMetadataTrigger(new JavaType(RooConfigurable.class.getName()));
+	}
+
 	protected ItdTypeDetailsProvidingMetadataItem getMetadata(String metadataIdentificationString, JavaType aspectName, PhysicalTypeMetadata governorPhysicalTypeMetadata, String itdFilename) {
 		return new ConfigurableMetadata(metadataIdentificationString, aspectName, governorPhysicalTypeMetadata);
 	}

diff --git a/...r/src/main/java/org/springframework/roo/addon/property/editor/EditorMetadataProvider.java b/...r/src/main/java/org/springframework/roo/addon/property/editor/EditorMetadataProvider.java
@@ -26,6 +26,11 @@ protected void activate(ComponentContext context) {
 		addMetadataTrigger(new JavaType(RooEditor.class.getName()));
 	}
 
+	protected void deactivate(ComponentContext context) {
+		metadataDependencyRegistry.deregisterDependency(PhysicalTypeIdentifier.getMetadataIdentiferType(), getProvidesType());
+		removeMetadataTrigger(new JavaType(RooEditor.class.getName()));
+	}
+
 	protected ItdTypeDetailsProvidingMetadataItem getMetadata(String metadataIdentificationString, JavaType aspectName, PhysicalTypeMetadata governorPhysicalTypeMetadata, String itdFilename) {
 		// We know governor type details are non-null and can be safely cast
 
@@ -64,8 +69,7 @@ public String getItdUniquenessFilenameSuffix() {
 	protected String getGovernorPhysicalTypeIdentifier(String metadataIdentificationString) {
 		JavaType javaType = EditorMetadata.getJavaType(metadataIdentificationString);
 		Path path = EditorMetadata.getPath(metadataIdentificationString);
-		String physicalTypeIdentifier = PhysicalTypeIdentifier.createIdentifier(javaType, path);
-		return physicalTypeIdentifier;
+		return PhysicalTypeIdentifier.createIdentifier(javaType, path);
 	}
 
 	protected String createLocalIdentifier(JavaType javaType, Path path) {