Changeset 1631 for ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java

Timestamp:

11/28/11 15:46:02 (13 years ago)

Author:

jeafer

Message:

Jean-Charles branch initial commit,
Changes regarding comment on the ComponentRegistry service.
Get comment from RestService? to Database access (CommentsDao?) implemented.
TestComment? class in development

Location:

ComponentRegistry/branches/jeaferversion

Files:

• . (copied) (copied from ComponentRegistry/trunk)
• ComponentRegistry (modified) (1 prop)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java (modified) (3 diffs)

ComponentRegistry/branches/jeaferversion/ComponentRegistry

@@ -7 +7 @@
 profiles.xml
 nb-configuration.xml
+nbactions-Run without tests.xml

@@ -7 +7 @@
 profiles.xml
 nb-configuration.xml
+nbactions-Run without tests.xml

ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java

@@ -20 +20 @@
 import clarin.cmdi.componentregistry.components.CMDComponentSpec.Header;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
+import clarin.cmdi.componentregistry.model.CommentMapping.Comment;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -33 +34 @@
     @Override
     public List<ComponentDescription> getUsageInComponents(String componentId) throws ComponentRegistryException {
-        List<ComponentDescription> result = new ArrayList<ComponentDescription>();
-        List<ComponentDescription> descs = getComponentDescriptions();
-        for (ComponentDescription desc : descs) {
-            CMDComponentSpec spec = getMDComponent(desc.getId());
-            if (spec != null && findComponentId(componentId, spec.getCMDComponent())) {
-                result.add(desc);
-            }
-        }
-        return result;
+        List<ComponentDescription> result = new ArrayList<ComponentDescription>();
+        List<ComponentDescription> descs = getComponentDescriptions();
+        for (ComponentDescription desc : descs) {
+            CMDComponentSpec spec = getMDComponent(desc.getId());
+            if (spec != null && findComponentId(componentId, spec.getCMDComponent())) {
+                result.add(desc);
+            }
+        }
+        return result;
     }
 
     @Override
     public List<ProfileDescription> getUsageInProfiles(String componentId) throws ComponentRegistryException {
-        List<ProfileDescription> result = new ArrayList<ProfileDescription>();
-        for (ProfileDescription profileDescription : getProfileDescriptions()) {
-            CMDComponentSpec profile = getMDProfile(profileDescription.getId());
-            if (profile != null && findComponentId(componentId, profile.getCMDComponent())) {
-                result.add(profileDescription);
-            }
-        }
-        return result;
+        List<ProfileDescription> result = new ArrayList<ProfileDescription>();
+        for (ProfileDescription profileDescription : getProfileDescriptions()) {
+            CMDComponentSpec profile = getMDProfile(profileDescription.getId());
+            if (profile != null && findComponentId(componentId, profile.getCMDComponent())) {
+                result.add(profileDescription);
+            }
+        }
+        return result;
     }
+
+//    public List<Comment> getUsageInComments(String componentId) throws ComponentRegistryException {
+//        List<Comment> result = new ArrayList<Comment>();
+//        for (Comment comment : getComments()) {
+//            CMDComponentSpec myComment = getMDComment(comment.getId());
+//            if (myComment != null && findComponentId(componentId, myComment.getCMDComponent())) {
+//            result.add(comment);
+//            System.out.println("get unsage in comments : " + myComment + "\n");
+//            }
+//        }
+//        
+//        return result;
+//    }
 
     /**
@@ -63 +77 @@
     @Override
     public List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException {
-        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDao, should have better performance
+        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDao, should have better performance
 
-        // Get all profile descriptions
-        List<ProfileDescription> descriptionsCollection = getProfileDescriptions();
-        // Filter out ones that do should not be shown for metadata editor
-        ArrayList<ProfileDescription> descriptions = new ArrayList<ProfileDescription>(descriptionsCollection.size());
-        for (ProfileDescription profile : descriptionsCollection) {
-            if (((ProfileDescription) profile).isShowInEditor()) {
-                descriptions.add((ProfileDescription) profile);
-            }
-        }
-        // Return filtered list
-        return descriptions;
+        // Get all profile descriptions
+        List<ProfileDescription> descriptionsCollection = getProfileDescriptions();
+        // Filter out ones that do should not be shown for metadata editor
+        ArrayList<ProfileDescription> descriptions = new ArrayList<ProfileDescription>(descriptionsCollection.size());
+        for (ProfileDescription profile : descriptionsCollection) {
+            if (((ProfileDescription) profile).isShowInEditor()) {
+                descriptions.add((ProfileDescription) profile);
+            }
+        }
+        // Return filtered list
+        return descriptions;
     }
 
     /* HELPER METHODS */
     protected static String stripRegistryId(String id) {
-        return StringUtils.removeStart(id, ComponentRegistry.REGISTRY_ID);
+        return StringUtils.removeStart(id, ComponentRegistry.REGISTRY_ID);
     }
 
     protected static void enrichSpecHeader(CMDComponentSpec spec, AbstractDescription description) {
-        Header header = spec.getHeader();
-        header.setID(description.getId());
-        if (StringUtils.isEmpty(header.getName())) {
-            header.setName(description.getName());
-        }
-        if (StringUtils.isEmpty(header.getDescription())) {
-            header.setDescription(description.getDescription());
-        }
+        Header header = spec.getHeader();
+        header.setID(description.getId());
+        if (StringUtils.isEmpty(header.getName())) {
+            header.setName(description.getName());
+        }
+        if (StringUtils.isEmpty(header.getDescription())) {
+            header.setDescription(description.getDescription());
+        }
     }
 
     protected static boolean findComponentId(String componentId, List<CMDComponentType> componentReferences) {
-        for (CMDComponentType cmdComponent : componentReferences) {
-            if (componentId.equals(cmdComponent.getComponentId())) {
-                return true;
-            } else if (findComponentId(componentId, cmdComponent.getCMDComponent())) {
-                return true;
-            }
-        }
-        return false;
+        for (CMDComponentType cmdComponent : componentReferences) {
+            if (componentId.equals(cmdComponent.getComponentId())) {
+                return true;
+            } else if (findComponentId(componentId, cmdComponent.getCMDComponent())) {
+                return true;
+            }
+        }
+        return false;
     }
 
     protected static void writeXsd(CMDComponentSpec expandedSpec, OutputStream outputStream) {
-        MDMarshaller.generateXsd(expandedSpec, outputStream);
+        MDMarshaller.generateXsd(expandedSpec, outputStream);
     }
 
     protected static void writeXml(CMDComponentSpec spec, OutputStream outputStream) {
-        try {
-            MDMarshaller.marshal(spec, outputStream);
-        } catch (UnsupportedEncodingException e) {
-            LOG.error("Error in encoding: ", e);
-        } catch (JAXBException e) {
-            LOG.error("Cannot marshall spec: " + spec, e);
-        }
+        try {
+            MDMarshaller.marshal(spec, outputStream);
+        } catch (UnsupportedEncodingException e) {
+            LOG.error("Error in encoding: ", e);
+        } catch (JAXBException e) {
+            LOG.error("Cannot marshall spec: " + spec, e);
+        }
     }
 
     protected void checkStillUsed(String componentId) throws DeleteFailedException, ComponentRegistryException {
-        List<ProfileDescription> profiles = getUsageInProfiles(componentId);
-        List<ComponentDescription> components = getUsageInComponents(componentId);
-        if (!profiles.isEmpty() || !components.isEmpty()) {
-            throw new DeleteFailedException(createStillInUseMessage(profiles, components));
-        }
+        List<ProfileDescription> profiles = getUsageInProfiles(componentId);
+        List<ComponentDescription> components = getUsageInComponents(componentId);
+        if (!profiles.isEmpty() || !components.isEmpty()) {
+            throw new DeleteFailedException(createStillInUseMessage(profiles, components));
+        }
     }
 
     private String createStillInUseMessage(List<ProfileDescription> profiles, List<ComponentDescription> components) {
-        StringBuilder result = new StringBuilder();
-        if (!profiles.isEmpty()) {
-            result.append("Still used by the following profiles: \n");
-            for (ProfileDescription profileDescription : profiles) {
-                result.append(" - ").append(profileDescription.getName()).append("\n");
-            }
-        }
-        if (!components.isEmpty()) {
-            result.append("Still used by the following components: \n");
-            for (ComponentDescription componentDescription : components) {
-                result.append(" - ").append(componentDescription.getName()).append("\n");
-            }
-        }
-        result.append("Try to change above mentioned references first.");
-        return result.toString();
+        StringBuilder result = new StringBuilder();
+        if (!profiles.isEmpty()) {
+            result.append("Still used by the following profiles: \n");
+            for (ProfileDescription profileDescription : profiles) {
+                result.append(" - ").append(profileDescription.getName()).append("\n");
+            }
+        }
+        if (!components.isEmpty()) {
+            result.append("Still used by the following components: \n");
+            for (ComponentDescription componentDescription : components) {
+                result.append(" - ").append(componentDescription.getName()).append("\n");
+            }
+        }
+        result.append("Try to change above mentioned references first.");
+        return result.toString();
     }
 }

@@ -7 +7 @@
 profiles.xml
 nb-configuration.xml
+nbactions-Run without tests.xml