Browse Source

Reorganize Row classes.

master
Stanislav Usenkov 9 years ago
parent
commit
212703f710
  1. 8
      src/main/java/ru/simsonic/rscPermissions/API/ConditionalRow.java
  2. 21
      src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java
  3. 18
      src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java
  4. 20
      src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java
  5. 21
      src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java

8
src/main/java/ru/simsonic/rscPermissions/API/ConditionalRow.java

@ -0,0 +1,8 @@
package ru.simsonic.rscPermissions.API;
public abstract class ConditionalRow extends GenericRow
{
public Destination destination;
public transient String destinationSource;
public int expirience;
}

21
src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java

@ -0,0 +1,21 @@
package ru.simsonic.rscPermissions.API;
import java.sql.Timestamp;
public abstract class GenericRow
{
public int id;
public transient String splittedId;
public String entity;
public EntityType entityType;
public transient PlayerType playerType;
public Timestamp lifetime;
public boolean isMappedInDB()
{
return splittedId != null && !"".equals(splittedId);
}
public boolean hasClonesInRow()
{
return splittedId != null && splittedId.contains(Settings.SPLITTED_ID_SEP);
}
}

18
src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java

@ -1,27 +1,11 @@
package ru.simsonic.rscPermissions.API; package ru.simsonic.rscPermissions.API;
import java.sql.Timestamp; public final class RowEntity extends GenericRow implements Cloneable, Comparable<RowEntity>
public class RowEntity implements Cloneable, Comparable<RowEntity>
{ {
public int id;
public String entity;
public EntityType entityType;
public String prefix; public String prefix;
public String suffix; public String suffix;
public Timestamp lifetime;
public transient String splittedId;
public transient PlayerType playerType;
public transient RowPermission[] permissions; public transient RowPermission[] permissions;
public transient RowInheritance[] inheritance; public transient RowInheritance[] inheritance;
public boolean isMappedInDB()
{
return splittedId != null && !"".equals(splittedId);
}
public boolean hasClonesInRow()
{
return splittedId != null && splittedId.contains(Settings.SPLITTED_ID_SEP);
}
@Override @Override
public RowEntity clone() throws CloneNotSupportedException public RowEntity clone() throws CloneNotSupportedException
{ {

20
src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java

@ -1,23 +1,13 @@
package ru.simsonic.rscPermissions.API; package ru.simsonic.rscPermissions.API;
import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes;
public class RowInheritance implements Cloneable, Comparable<RowInheritance> public final class RowInheritance extends ConditionalRow implements Cloneable, Comparable<RowInheritance>
{ {
public int id;
public String entity;
public String parent; public String parent;
public String instance; public String instance;
public EntityType childType;
public int priority; public int priority;
public Destination destination;
public int expirience;
public Timestamp lifetime;
public transient String splittedId;
public transient PlayerType playerType;
public transient String destinationSource;
public transient RowEntity entityChild; public transient RowEntity entityChild;
public transient RowEntity entityParent; public transient RowEntity entityParent;
public void deriveInstance() public void deriveInstance()
@ -38,14 +28,6 @@ public class RowInheritance implements Cloneable, Comparable<RowInheritance>
{ {
return this.parent + (instance.isEmpty() ? "" : "." + instance); return this.parent + (instance.isEmpty() ? "" : "." + instance);
} }
public boolean isMappedInDB()
{
return splittedId != null && !"".equals(splittedId);
}
public boolean hasClonesInRow()
{
return splittedId != null && splittedId.contains(Settings.SPLITTED_ID_SEP);
}
@Override @Override
public RowInheritance clone() throws CloneNotSupportedException public RowInheritance clone() throws CloneNotSupportedException
{ {

21
src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java

@ -1,29 +1,10 @@
package ru.simsonic.rscPermissions.API; package ru.simsonic.rscPermissions.API;
import java.sql.Timestamp; public final class RowPermission extends ConditionalRow implements Cloneable, Comparable<RowPermission>
public class RowPermission implements Cloneable, Comparable<RowPermission>
{ {
public int id;
public String entity;
public EntityType entityType;
public String permission; public String permission;
public boolean value; public boolean value;
public Destination destination;
public int expirience;
public Timestamp lifetime;
public transient String splittedId;
public transient PlayerType playerType;
public transient String destinationSource;
public transient RowEntity entityObject; public transient RowEntity entityObject;
public boolean isMappedInDB()
{
return splittedId != null && !"".equals(splittedId);
}
public boolean hasClonesInRow()
{
return splittedId != null && splittedId.contains(Settings.SPLITTED_ID_SEP);
}
@Override @Override
public RowPermission clone() throws CloneNotSupportedException public RowPermission clone() throws CloneNotSupportedException
{ {

Loading…
Cancel
Save