Author: mir
Date: Thu Jul 1 16:07:25 2010
New Revision: 959706
URL: http://svn.apache.org/viewvc?rev=959706&view=rev
Log:
CLEREZZA-250: implemented equals() and hashCode()-methods in
PermissionDescription class
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionDescripton.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionGatherer.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionDescripton.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionDescripton.java?rev=959706&r1=959705&r2=959706&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionDescripton.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionDescripton.java
Thu Jul 1 16:07:25 2010
@@ -80,5 +80,38 @@ public class PermissionDescripton {
public String getJavaPermissionString() {
return javaPermissionString ;
}
-
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final PermissionDescripton other = (PermissionDescripton) obj;
+ if ((this.name == null) ? (other.name != null) :
!this.name.equals(other.name)) {
+ return false;
+ }
+ if ((this.description == null) ? (other.description != null) :
!this.description.equals(other.description)) {
+ return false;
+ }
+ if ((this.javaPermissionString == null) ?
(other.javaPermissionString != null) :
!this.javaPermissionString.equals(other.javaPermissionString)) {
+ return false;
+ }
+ if (this.iconUri != other.iconUri && (this.iconUri == null ||
!this.iconUri.equals(other.iconUri))) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 41 * hash + (this.name != null ? this.name.hashCode() :
0);
+ hash = 41 * hash + (this.description != null ?
this.description.hashCode() : 0);
+ hash = 41 * hash + (this.javaPermissionString != null ?
this.javaPermissionString.hashCode() : 0);
+ hash = 41 * hash + (this.iconUri != null ?
this.iconUri.hashCode() : 0);
+ return hash;
+ }
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionGatherer.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionGatherer.java?rev=959706&r1=959705&r2=959706&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionGatherer.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.permissiondescriptions/src/main/java/org/apache/clerezza/permissiondescriptions/PermissionGatherer.java
Thu Jul 1 16:07:25 2010
@@ -160,6 +160,8 @@ public class PermissionGatherer implemen
protected void deactivate(final ComponentContext componentContext) {
componentContext.getBundleContext().removeBundleListener(this);
+ bundle2PermissionClassesMap.clear();
+ bundle2PermissionDescriptorsMap.clear();
}
@Override
