Changeset 2068

Timestamp:

08/08/12 08:28:32 (12 years ago)

Author:

twagoo

Message:

renamed owner and status fields in ComponentRegistryDbImpl?

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (9 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -48 +48 @@
 
     private final static Logger LOG = LoggerFactory.getLogger(ComponentRegistryDbImpl.class);
-    private Owner owner;
-    private ComponentStatus status;
+    private Owner registryOwner;
+    private ComponentStatus registryStatus;
     @Autowired
     private Configuration configuration;
@@ -75 +75 @@
      */
     public ComponentRegistryDbImpl() {
-        this.status = ComponentStatus.PUBLIC;
+        this.registryStatus = ComponentStatus.PUBLIC;
     }
 
@@ -87 +87 @@
      */
     public ComponentRegistryDbImpl(ComponentStatus status, Owner owner) {
-        this.status = status;
-        this.owner = owner;
+        this.registryStatus = status;
+        this.registryOwner = owner;
     }
 
@@ -94 +94 @@
     public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException {
         try {
-            switch (status) {
+            switch (registryStatus) {
                 // TODO: support other status types
                 case DEVELOPMENT:
-                    if (owner == null) {
+                    if (registryOwner == null) {
                         throw new ComponentRegistryException("Development workspace without owner!");
                     }
                     // TODO: Support group space
-                    return profileDescriptionDao.getUserspaceDescriptions(owner.getId());
+                    return profileDescriptionDao.getUserspaceDescriptions(registryOwner.getId());
                 case PUBLIC:
                     return profileDescriptionDao.getPublicProfileDescriptions();
                 default:
-                    throw new ComponentRegistryException("Unsupported status type" + status);
+                    throw new ComponentRegistryException("Unsupported status type" + registryStatus);
             }
         } catch (DataAccessException ex) {
@@ -512 +512 @@
     @Deprecated
     public boolean isPublic() {
-        return status == ComponentStatus.PUBLIC;
+        return registryStatus == ComponentStatus.PUBLIC;
     }
 
@@ -519 +519 @@
      */
     private Number getUserId() {
-        if (owner instanceof OwnerUser) {
-            return owner.getId();
+        if (registryOwner instanceof OwnerUser) {
+            return registryOwner.getId();
         } else {
             return null;
@@ -530 +530 @@
      */
     private Number getGroupId() {
-        if (owner instanceof OwnerGroup) {
-            return owner.getId();
+        if (registryOwner instanceof OwnerGroup) {
+            return registryOwner.getId();
         } else {
             return null;
@@ -539 +539 @@
     @Override
     public Owner getOwner() {
-        return owner;
+        return registryOwner;
     }
 
@@ -550 +550 @@
     public void setStatus(ComponentStatus status, Owner owner) {
         setStatus(status);
-        this.owner = owner;
+        this.registryOwner = owner;
     }
 
     public void setStatus(ComponentStatus status) {
-        this.status = status;
+        this.registryStatus = status;
     }
 
     @Override
     public ComponentStatus getStatus() {
-        return status;
+        return registryStatus;
     }