WebSVN - bacoAlunos - Path Comparison - / Rev 334 and / Rev 335

Ignore whitespace Rev 334 → Rev 335

 /impl/src/java/pt/estgp/estgweb/services/data/RepositoryService.java
 ,18 → 26,17
 {
     /**
-     *
-     * @param stream  .
-     * @param contentType .
-     * @param size  .
-     * @param name .
-     * @param description .
+     * @param stream        .
+     * @param contentType   .
+     * @param size          .
+     * @param name          .
+     * @param description   .
+     * @param extension     .
+     * @param accessControl .
+     * @param userSession   .
      * @return the identifier to retrieve the document
-     * @param extension .
-     * @param accessControl .
-     * @param userSession .
      */
-    public String storeRepositoryFile(InputStream stream, String contentType, String extension,int size, String name, String description, ResourceAccessControlEnum accessControl, UserSession userSession)
+    public String storeRepositoryFile(InputStream stream, String contentType, String extension, int size, String name, String description, ResourceAccessControlEnum accessControl, UserSession userSession)
     {
         RepositoryFileImpl repositoryFile = DomainObjectFactory.createRepositoryFileImpl();
         repositoryFile.setSaveDate(new Date());
 ,22 → 53,20
         repositoryFileVersion.setExtension(extension);
         Document dom = createXMLdescription(repositoryFileVersion);
-        RepositoryManager.storeDescription(dom,repositoryFileVersion.getId());
-        RepositoryManager.store(stream,repositoryFileVersion.getId());
+        RepositoryManager.storeDescription(dom, repositoryFileVersion.getId());
+        RepositoryManager.store(stream, repositoryFileVersion.getId());
         return new StringBuilder().append(repositoryFile.getId()).toString();
     }
     /**
-     *
-     * @param stream       .
+     * @param stream        .
      * @param contentType   .
-     * @param size .
-     * @param name  .
-     * @param description  .
-     * @param identifier .
-     * @param extension .
+     * @param size          .
+     * @param name          .
+     * @param description   .
+     * @param identifier    .
+     * @param extension     .
      * @param accessControl .
      */
     public void updateRepositoryFile(String identifier, InputStream stream, String contentType, String extension, int size, String name, String description, ResourceAccessControlEnum accessControl)
 ,22 → 82,19
         repositoryFileVersion.setContentType(contentType);
         repositoryFileVersion.setExtension(extension);
         Document dom = createXMLdescription(repositoryFileVersion);
-        RepositoryManager.storeDescription(dom,repositoryFileVersion.getId());
-        RepositoryManager.store(stream,repositoryFileVersion.getId());
+        RepositoryManager.storeDescription(dom, repositoryFileVersion.getId());
+        RepositoryManager.store(stream, repositoryFileVersion.getId());
     }
     /**
-     *
      * @param identifier .
      * @return a view of a document
      */
     public RepositoryFileImpl loadView(String identifier)
     {
         RepositoryFileImpl repositoryFile = (RepositoryFileImpl) DaoFactory.getRepositoryFileDaoImpl().get(Long.parseLong(identifier));
-        for(RepositoryFileVersionImpl version: repositoryFile.getRepositoryFileVersions())
+        for (RepositoryFileVersionImpl version : repositoryFile.getRepositoryFileVersions())
         {
             version.getSaveDate();
         }
 ,12 → 102,11
     }
     /**
-     *
-     * @param identifier .
+     * @param identifier  .
+     * @param userSession .
      * @return a view with an inputStream for document
-     * @param userSession .
      */
-    public IRepositoryFile load(String identifier,UserSession userSession)
+    public IRepositoryFile load(String identifier, UserSession userSession)
     {
         DefaultRepositoryFile iRepositoryFile = new DefaultRepositoryFile();
         RepositoryFileImpl repositoryFile = (RepositoryFileImpl) DaoFactory.getRepositoryFileDaoImpl().load(Long.parseLong(identifier));
 ,16 → 118,15
     }
     /**
-     *
-     * @param identifier .
+     * @param identifier  .
+     * @param userSession .
      * @return a view with an inputStream for document
-     * @param userSession .
      */
-    public List<IRepositoryFile> loadVersions(String identifier,UserSession userSession)
+    public List<IRepositoryFile> loadVersions(String identifier, UserSession userSession)
     {
         RepositoryFileImpl repositoryFile = (RepositoryFileImpl) DaoFactory.getRepositoryFileDaoImpl().load(Long.parseLong(identifier));
         List<IRepositoryFile> versions = new ArrayList<IRepositoryFile>();
-        for(RepositoryFileVersionImpl version : repositoryFile.getRepositoryFileVersions())
+        for (RepositoryFileVersionImpl version : repositoryFile.getRepositoryFileVersions())
         {
             DefaultRepositoryFile iRepositoryFile = new DefaultRepositoryFile();
             iRepositoryFile.setContentType(version.getContentType());
 ,6 → 140,7
     /**
      * Create a new File Version
+     *
      * @param repositoryFile .
      * @return .
      */
 ,7 → 148,7
     {
         RepositoryFileVersionImpl repositoryFileVersion = DomainObjectFactory.createRepositoryFileVersionImpl();
         repositoryFileVersion.setRepositoryFile(repositoryFile);
-        if(repositoryFile.getRepositoryFileVersions() == null)
+        if (repositoryFile.getRepositoryFileVersions() == null)
             repositoryFile.setRepositoryFileVersions(new HashSet<RepositoryFileVersionImpl>());
         repositoryFile.getRepositoryFileVersions().add(repositoryFileVersion);
         repositoryFile.setLastVersion(repositoryFileVersion);
 ,22 → 161,22
         org.dom4j.Document dom = DocumentFactory.getInstance().createDocument();
         Element rootElement = DocumentFactory.getInstance().createElement("repositoryFileVersion");
         dom.setRootElement(rootElement);
-        rootElement.addAttribute("id",""+repositoryFile.getId());
+        rootElement.addAttribute("id", "" + repositoryFile.getId());
         Element saveDate = DocumentFactory.getInstance().createElement("saveDate");
-        saveDate.setText(DatesUtils.getStringFromDateForFilename(repositoryFile.getSaveDate()));
+        saveDate.setText(""+DatesUtils.getStringFromDateForFilename(repositoryFile.getSaveDate()));
         Element name = DocumentFactory.getInstance().createElement("name");
-        name.setText(""+repositoryFile.getName());
+        name.setText("" + repositoryFile.getName());
         Element contentType = DocumentFactory.getInstance().createElement("contentType");
-        contentType.setText(repositoryFile.getContentType());
+        contentType.setText(""+repositoryFile.getContentType());
         Element extension = DocumentFactory.getInstance().createElement("extension");
-        extension.setText(""+repositoryFile.getExtension());
+        extension.setText("" + repositoryFile.getExtension());
         Element size = DocumentFactory.getInstance().createElement("sizeKb");
-        size.setText(""+repositoryFile.getSizeKb());
+        size.setText("" + repositoryFile.getSizeKb());
         Element description = DocumentFactory.getInstance().createElement("description");
         description.setText(repositoryFile.getDescription());
 ,12 → 192,12
         Element repositoryFileElem = DocumentFactory.getInstance().createElement("repositoryFile");
         rootElement.add(repositoryFileElem);
-        repositoryFileElem.addAttribute("id","" + repositoryFile.getRepositoryFile().getId());
+        repositoryFileElem.addAttribute("id", "" + repositoryFile.getRepositoryFile().getId());
         Element rSaveDate = DocumentFactory.getInstance().createElement("saveDate");
-        rSaveDate.setText(DatesUtils.getStringFromDateForFilename(repositoryFile.getRepositoryFile().getSaveDate()));
+        rSaveDate.setText(""+DatesUtils.getStringFromDateForFilename(repositoryFile.getRepositoryFile().getSaveDate()));
         Element rUpdateDate = DocumentFactory.getInstance().createElement("updateDate");
-        rUpdateDate.setText(DatesUtils.getStringFromDateForFilename(repositoryFile.getRepositoryFile().getUpdateDate()));
+        rUpdateDate.setText(""+DatesUtils.getStringFromDateForFilename(repositoryFile.getRepositoryFile().getUpdateDate()));
         Element accessControl = DocumentFactory.getInstance().createElement("accessControl");
 ,47 → 213,65
         Element owner = DocumentFactory.getInstance().createElement("owner");
         repositoryFileElem.add(owner);
-        owner.addAttribute("id","" + repositoryFile.getRepositoryFile().getOwner().getId());
-        Element oName = DocumentFactory.getInstance().createElement("name");
-        oName.setText(repositoryFile.getRepositoryFile().getOwner().getName());
+        owner.addAttribute("id", "" + repositoryFile.getRepositoryFile().getOwner().getId());
-        Element oRoles = DocumentFactory.getInstance().createElement("roles");
-        oRoles.setText(repositoryFile.getRepositoryFile().getOwner().getRoles());
+        if (repositoryFile.getRepositoryFile().getOwner().getName() != null)
+        {
+            Element oName = DocumentFactory.getInstance().createElement("name");
+            oName.setText(repositoryFile.getRepositoryFile().getOwner().getName());
+            owner.add(oName);
+        }
+        if (DocumentFactory.getInstance().createElement("roles") != null)
+        {
+            Element oRoles = DocumentFactory.getInstance().createElement("roles");
+            oRoles.setText(repositoryFile.getRepositoryFile().getOwner().getRoles());
+            owner.add(oRoles);
+        }
         Element oClass = DocumentFactory.getInstance().createElement("class");
         oClass.setText(repositoryFile.getRepositoryFile().getOwner().getClass().getSimpleName());
-        owner.add(oName);
-        owner.add(oRoles);
         owner.add(oClass);
-        if(repositoryFile.getRepositoryFile().getOwner() instanceof User)
+        if (repositoryFile.getRepositoryFile().getOwner() instanceof User)
         {
             Element oUsername = DocumentFactory.getInstance().createElement("username");
-            oUsername.setText(((User)repositoryFile.getRepositoryFile().getOwner()).getUsername());
+            oUsername.setText(((User) repositoryFile.getRepositoryFile().getOwner()).getUsername());
+            owner.add(oUsername);
-            Element oEmail = DocumentFactory.getInstance().createElement("email");
-            oEmail.setText(((User)repositoryFile.getRepositoryFile().getOwner()).getEmail());
+            if (((User) repositoryFile.getRepositoryFile().getOwner()).getEmail() != null)
+            {
+                Element oEmail = DocumentFactory.getInstance().createElement("email");
+                oEmail.setText(((User) repositoryFile.getRepositoryFile().getOwner()).getEmail());
+                owner.add(oEmail);
+            }
-            Element outEmail = DocumentFactory.getInstance().createElement("outEmail");
-            outEmail.setText(((User)repositoryFile.getRepositoryFile().getOwner()).getOutEmail());
+            if (((User) repositoryFile.getRepositoryFile().getOwner()).getOutEmail() != null)
+            {
+                Element outEmail = DocumentFactory.getInstance().createElement("outEmail");
+                outEmail.setText(((User) repositoryFile.getRepositoryFile().getOwner()).getOutEmail());
+                owner.add(outEmail);
+            }
-            Element biEmail = DocumentFactory.getInstance().createElement("bi");
-            biEmail.setText(((User)repositoryFile.getRepositoryFile().getOwner()).getBi());
+            if (((User) repositoryFile.getRepositoryFile().getOwner()).getBi() != null)
+            {
+                Element biEmail = DocumentFactory.getInstance().createElement("bi");
+                biEmail.setText(((User) repositoryFile.getRepositoryFile().getOwner()).getBi());
+                owner.add(biEmail);
+            }
-            owner.add(oUsername);
-            owner.add(oEmail);
-            owner.add(outEmail);
-            owner.add(biEmail);
-            if(repositoryFile.getRepositoryFile().getOwner() instanceof Teacher)
+            if (repositoryFile.getRepositoryFile().getOwner() instanceof Teacher)
             {
                 Element code = DocumentFactory.getInstance().createElement("teacherCode");
-                code.setText(""+((Teacher)repositoryFile.getRepositoryFile().getOwner()).getSigesCode());
+                code.setText("" + ((Teacher) repositoryFile.getRepositoryFile().getOwner()).getSigesCode());
                 owner.add(code);
             }
-            if(repositoryFile.getRepositoryFile().getOwner() instanceof Student)
+            if (repositoryFile.getRepositoryFile().getOwner() instanceof Student)
             {
                 Element code = DocumentFactory.getInstance().createElement("studentCode");
-                code.setText(""+((Student)repositoryFile.getRepositoryFile().getOwner()).getSigesCode());
+                code.setText("" + ((Student) repositoryFile.getRepositoryFile().getOwner()).getSigesCode());
                 owner.add(code);
             }
         }

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 334 → Rev 335