modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java | 2 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4bed8786b2d15c9ace92b938e1b9e160dde5d65e Author: Joseph Marques joseph@redhat.com Date: Wed Aug 11 00:30:37 2010 -0400
fix 2 compilation errors where Set could not be assigned to EnumSet
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java index 9e853f0..2c572fb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java @@ -60,7 +60,7 @@ public class GroupActivationContext extends AbstractResourceOrGroupActivationCon // lazy load if (this.facets == null) { ResourceFacets resourceFacets = this.resourceTypeManager.getResourceFacets(getResourceType().getId()); - this.facets = resourceFacets.getFacets(); + this.facets = EnumSet.copyOf(resourceFacets.getFacets()); } return this.facets; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java index 510f584..de91285 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java @@ -62,7 +62,7 @@ public class ResourceActivationContext extends AbstractResourceOrGroupActivation if (this.facets == null) { ResourceFacets resourceFacets = this.resourceTypeManager.getResourceFacets(resource.getResourceType() .getId()); - this.facets = resourceFacets.getFacets(); + this.facets = EnumSet.copyOf(resourceFacets.getFacets()); } return this.facets; }
rhq-commits@lists.fedorahosted.org