Changeset 1339

Timestamp:

05/18/11 15:53:21 (13 years ago)

Author:

twagoo

Message:

ComponentRegistryImplBase? for shared methods between fs Impl and DbImpl?

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl

Files:

• ComponentRegistryImplBase.java (added)
• database/ComponentRegistryDbImpl.java (modified) (3 diffs)
• filesystem/ComponentRegistryImpl.java (modified) (4 diffs)

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

@@ -8 +8 @@
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.impl.ComponentRegistryImplBase;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
@@ -33 +34 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public class ComponentRegistryDbImpl implements ComponentRegistry {
+public class ComponentRegistryDbImpl extends ComponentRegistryImplBase implements ComponentRegistry  {
 
     private final static Logger LOG = LoggerFactory.getLogger(ComponentRegistryDbImpl.class);
@@ -251 +252 @@
             throw ex;
         }
-    }
-
-    @Override
-    public List<ComponentDescription> getUsageInComponents(String componentId) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public List<ProfileDescription> getUsageInProfiles(String componentId) {
-        throw new UnsupportedOperationException("Not supported yet.");
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryImpl.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.filesystem;
 
+import clarin.cmdi.componentregistry.impl.ComponentRegistryImplBase;
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryUtils;
@@ -11 +12 @@
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.security.Principal;
 import java.text.ParseException;
@@ -41 +41 @@
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 
-public class ComponentRegistryImpl implements ComponentRegistry {
+public class ComponentRegistryImpl extends ComponentRegistryImplBase implements ComponentRegistry {
 
     public static final String DESCRIPTION_FILE_NAME = "description.xml";
@@ -395 +395 @@
 
     @Override
-    public List<ComponentDescription> getUsageInComponents(String componentId) {
-        List<ComponentDescription> result = new ArrayList<ComponentDescription>();
-        List<ComponentDescription> descs = getComponentDescriptions();
-        for (ComponentDescription desc : descs) {
-            CMDComponentSpec spec = getMDComponent(desc.getId());
-            if (spec != null && ComponentRegistryUtils.findComponentId(componentId, spec.getCMDComponent())) {
-                result.add(desc);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public List<ProfileDescription> getUsageInProfiles(String componentId) {
-        List<ProfileDescription> result = new ArrayList<ProfileDescription>();
-        for (ProfileDescription profileDescription : getProfileDescriptions()) {
-            CMDComponentSpec profile = getMDProfile(profileDescription.getId());
-            if (profile != null && ComponentRegistryUtils.findComponentId(componentId, profile.getCMDComponent())) {
-                result.add(profileDescription);
-            }
-        }
-        return result;
-    }
-
-    @Override
     public boolean isPublic() {
         return isPublic;