You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/08 19:08:10 UTC

cvs commit: cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/slide/impl SlidePrincipalProvider.java

unico       2003/12/08 10:08:10

  Modified:    src/blocks/slide/java/org/apache/cocoon/components/slide/impl
                        SlidePrincipalProvider.java
  Log:
  formatting and repository lookup
  
  Revision  Changes    Path
  1.2       +4 -14     cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlidePrincipalProvider.java
  
  Index: SlidePrincipalProvider.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlidePrincipalProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SlidePrincipalProvider.java	2 Dec 2003 19:18:45 -0000	1.1
  +++ SlidePrincipalProvider.java	8 Dec 2003 18:08:10 -0000	1.2
  @@ -167,15 +167,7 @@
   
           try {
               repository = (SlideRepository) this.manager.lookup(SlideRepository.ROLE);
  -            getLogger().debug("repository: " + repository);
  -            if ( !(repository instanceof SlideRepository)) {
  -                getLogger().error("Can't get Slide repository");
  -                return;
  -            }
  -
  -            SlideRepository sliderepository = (SlideRepository) repository;
  -
  -            this.nat = sliderepository.getNamespaceToken(namespace);
  +            this.nat = repository.getNamespaceToken(namespace);
   
               if (this.nat==null) {
                   throw new ProcessingException("Repository with the namespace '"+
  @@ -430,8 +422,7 @@
                   groupobject = structure.retrieve(slidetoken, group);
   
                   if (groupobject instanceof GroupNode) {
  -                    String name = groupobject.getUri().substring(userspath.length()+
  -                                      1);
  +                    String name = groupobject.getUri().substring(userspath.length()+1);
   
                       principalgroups.add(new PrincipalGroup(name));
                   }
  @@ -479,8 +470,7 @@
                   // create a revision with the appropriate properties set
                   NodeRevisionDescriptor revision = new NodeRevisionDescriptor(0);
   
  -                revision.setProperty(new NodeProperty("resourcetype",
  -                                                      "<collection/>", true));
  +                revision.setProperty(new NodeProperty("resourcetype","<collection/>", true));
                   revision.setCreationDate(new Date());
                   revision.setLastModified(new Date());
                   revision.setProperty(new NodeProperty("getcontentlength",