Browse Source

Fixed wrong group list ni /rscp user <user> lg.

It hides duplicate leafs of inheritance tree.
master
SimSonic 10 years ago
parent
commit
8386e14fd9
  1. 4
      pom.xml
  2. 4
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
  3. 4
      src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java
  4. 8
      src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java

4
pom.xml

@ -4,7 +4,7 @@
<groupId>ru.simsonic</groupId> <groupId>ru.simsonic</groupId>
<artifactId>rscPermissions</artifactId> <artifactId>rscPermissions</artifactId>
<version>0.9.16b</version> <version>0.9.17b</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rscPermissions</name> <name>rscPermissions</name>
@ -78,7 +78,7 @@
<dependency> <dependency>
<groupId>ru.simsonic</groupId> <groupId>ru.simsonic</groupId>
<artifactId>rscUtilityLibrary</artifactId> <artifactId>rscUtilityLibrary</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
<scope>compile</scope> <scope>compile</scope>
<type>jar</type> <type>jar</type>
</dependency> </dependency>

4
src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java

@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
@ -176,7 +176,7 @@ public class InternalCache
final ArrayList<RowInheritance> applicableInheritance = new ArrayList<>(); final ArrayList<RowInheritance> applicableInheritance = new ArrayList<>();
if(implicit_u != null && implicit_u.permissions != null) if(implicit_u != null && implicit_u.permissions != null)
processPermissions(params, Arrays.asList(implicit_u.permissions)); processPermissions(params, Arrays.asList(implicit_u.permissions));
params.groupList = new LinkedHashSet<>(); params.groupList = new LinkedList<>();
params.finalPerms = new HashMap<>(); params.finalPerms = new HashMap<>();
params.instantiator = ""; params.instantiator = "";
params.depth = 0; params.depth = 0;

4
src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java

@ -1,7 +1,7 @@
package ru.simsonic.rscPermissions.Engine; package ru.simsonic.rscPermissions.Engine;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import ru.simsonic.rscPermissions.API.RowEntity; import ru.simsonic.rscPermissions.API.RowEntity;
public class ResolutionParams public class ResolutionParams
@ -14,5 +14,5 @@ public class ResolutionParams
protected transient RowEntity parentEntity; protected transient RowEntity parentEntity;
protected transient String instantiator; protected transient String instantiator;
protected transient Map<String, Boolean> finalPerms; protected transient Map<String, Boolean> finalPerms;
protected transient Set<String> groupList; protected transient List<String> groupList;
} }

8
src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java

@ -2,8 +2,8 @@ package ru.simsonic.rscPermissions.Engine;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.API.Settings;
import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes;
@ -12,7 +12,7 @@ public class ResolutionResult
public String prefix = ""; public String prefix = "";
public String suffix = ""; public String suffix = "";
public Map<String, Boolean> permissions; public Map<String, Boolean> permissions;
protected Set<String> groups; protected List<String> groups;
public boolean hasPermission(String permission) public boolean hasPermission(String permission)
{ {
for(Map.Entry<String, Boolean> entry : permissions.entrySet()) for(Map.Entry<String, Boolean> entry : permissions.entrySet())
@ -32,9 +32,9 @@ public class ResolutionResult
} }
return false; return false;
} }
public Set<String> getOrderedGroups() public List<String> getOrderedGroups()
{ {
return Collections.unmodifiableSet(groups); return Collections.unmodifiableList(groups);
} }
public String[] getDeorderedGroups() public String[] getDeorderedGroups()
{ {

Loading…
Cancel
Save