Merged LDAP user/team pre-fetching and synchronization enhancement from msc...

James Moger

2013-02-25 64b6f382d35e1fea0172b222277dae0312f274e4

 src/com/gitblit/models/RepositoryModel.java

@@ -17,6 +17,7 @@


import java.io.Serializable;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Date;

import java.util.List;

import java.util.Map;

@@ -43,7 +44,7 @@
   // field names are reflectively mapped in EditRepository page

   public String name;

   public String description;

   public String owner;

   public List<String> owners;

   public Date lastChange;

   public boolean hasCommits;

   public boolean showRemoteBranches;

@@ -77,10 +78,12 @@
   public String originRepository;

   public boolean verifyCommitter;

   public String gcThreshold;

   public String gcPeriod;

   public int gcPeriod;

   public int maxActivityCommits;

   

   public transient boolean isCollectingGarbage;

   public Date lastGC;

   public String sparkleshareId;

   

   public RepositoryModel() {

      this("", "", "", new Date(0));

@@ -89,13 +92,15 @@
   public RepositoryModel(String name, String description, String owner, Date lastchange) {

      this.name = name;

      this.description = description;

      this.owner = owner;

      this.lastChange = lastchange;

      this.accessRestriction = AccessRestrictionType.NONE;

      this.authorizationControl = AuthorizationControl.NAMED;

      this.federationSets = new ArrayList<String>();

      this.federationStrategy = FederationStrategy.FEDERATE_THIS;   

      this.projectPath = StringUtils.getFirstPathElement(name);

      this.owners = new ArrayList<String>();

		
      addOwner(owner);

   }

   

   public List<String> getLocalBranches() {

@@ -160,7 +165,10 @@
   }

   

   public boolean isOwner(String username) {

      return owner != null && username != null && owner.equalsIgnoreCase(username);

      if (StringUtils.isEmpty(username) || ArrayUtils.isEmpty(owners)) {

         return false;

      }

      return owners.contains(username.toLowerCase());

   }

   

   public boolean isPersonalRepository() {

@@ -173,6 +181,10 @@
   

   public boolean allowAnonymousView() {

      return !accessRestriction.atLeast(AccessRestrictionType.VIEW);

   }

	
   public boolean isSparkleshared() {

      return !StringUtils.isEmpty(sparkleshareId);

   }

   

   public RepositoryModel cloneAs(String cloneName) {

@@ -192,6 +204,40 @@
      clone.useTickets = useTickets;

      clone.skipSizeCalculation = skipSizeCalculation;

      clone.skipSummaryMetrics = skipSummaryMetrics;

      clone.sparkleshareId = sparkleshareId; 
      return clone;

   }

}


   public void addOwner(String username) {

      if (!StringUtils.isEmpty(username)) {

         String name = username.toLowerCase();

         // a set would be more efficient, but this complicates JSON

         // deserialization so we enforce uniqueness with an arraylist

         if (!owners.contains(name)) {

            owners.add(name);

         }

      }

   }



   public void removeOwner(String username) {

      if (!StringUtils.isEmpty(username)) {

         owners.remove(username.toLowerCase());

      }

   }



   public void addOwners(Collection<String> usernames) {

      if (!ArrayUtils.isEmpty(usernames)) {

         for (String username : usernames) {

            addOwner(username);

         }

      }

   }



   public void removeOwners(Collection<String> usernames) {

      if (!ArrayUtils.isEmpty(owners)) {

         for (String username : usernames) {

            removeOwner(username);

         }

      }

   }

}