Browse Source

I don't remember why I wrote this uncommited changes ...

v10.10b
master
Stanislav Usenkov 8 years ago
parent
commit
2309bff4fb
  1. 30
      pom.xml
  2. 1
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
  3. 9
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java
  4. 2
      src/main/java/ru/simsonic/rscPermissions/IndependentMain.java

30
pom.xml

@ -11,11 +11,11 @@
<url>https://github.com/SimSonic/rscPermissions/</url>
<repositories>
<!-- Sponge API -->
<!--repository>
<id>sponge-repo</id>
<url>http://repo.spongepowered.org/maven/</url>
</repository-->
<!-- Reality_SC's repo with own libraries -->
<repository>
<id>methuselah-repo</id>
<url>https://maven.methuselah.ru/</url>
</repository>
<!-- Bukkit API / Spigot API -->
<repository>
<id>spigotmc-repo</id>
@ -36,11 +36,11 @@
<id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
<!-- Reality_SC's repo with own libraries -->
<repository>
<id>methuselah-repo</id>
<url>http://maven.methuselah.ru/</url>
</repository>
<!-- Sponge API -->
<!--repository>
<id>sponge-repo</id>
<url>http://repo.spongepowered.org/maven/</url>
</repository-->
</repositories>
<dependencies>
@ -55,21 +55,21 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.39</version>
<version>5.1.40</version>
<scope>runtime</scope>
</dependency>
<!-- Local cache is stored in JSON files -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.7</version>
<version>2.8.0</version>
<scope>compile</scope>
</dependency>
<!-- Spigot API -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<version>1.11.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- mcstats.org -->
@ -83,7 +83,7 @@
<dependency>
<groupId>ru.simsonic</groupId>
<artifactId>rscCommonsLibrary</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>

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

@ -102,6 +102,7 @@ public class InternalCache extends InternalStorage
params.parentEntity = row.entityParent;
intermediateResults.add(resolveParent(params));
}
params.parentEntity = implicit_u;
// Process all applicable prefixes using only entity id order
ResolutionResult result = processPrefixesAndSuffixes(params, intermediateResults);
for(RowEntity row : applicableEntities)

9
src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java

@ -17,23 +17,23 @@ class InternalStorage
protected final HashMap<String, RowEntity> entities_g = new HashMap<>();
protected final HashMap<String, RowEntity> entities_u = new HashMap<>();
protected final RowInheritance defaultInheritance = new RowInheritance();
protected String serverId;
protected RowEntity implicit_g;
protected RowEntity implicit_u;
private boolean freshRemoteData;
protected String serverId = "*";
private boolean isFreshData = false;
public synchronized void fill(DatabaseContents contents)
{
clear();
importEntities (contents);
importPermissions(contents.permissions);
importInheritance(contents.inheritance);
freshRemoteData = contents.cached;
isFreshData = contents.cached;
implicit_g = entities_g.get("");
implicit_u = entities_u.get("");
}
public synchronized boolean isFreshData()
{
return freshRemoteData;
return isFreshData;
}
private void importEntities(DatabaseContents contents)
{
@ -73,6 +73,7 @@ class InternalStorage
entities_g.put(groupInternalName, dummy);
}
}
names_u.add("");
for(String name : names_u)
if(!entities_u.containsKey(name))
{

2
src/main/java/ru/simsonic/rscPermissions/IndependentMain.java

@ -49,7 +49,7 @@ public class IndependentMain
}
intCache.setDefaultGroup("Default", true, true);
intCache.fill(contents);
final ResolutionResult result = intCache.resolvePlayer("87f946d8212440539d685eab07f8e266");
final ResolutionResult result = intCache.resolvePlayer("");
// Sorted output
for(Map.Entry<String, Boolean> entry : result.getPermissions().entrySet())
System.out.println("Permission: " + entry.getKey() + " = " + entry.getValue());

Loading…
Cancel
Save