Moved countPagesNumber method to MathUtil class.
This commit is contained in:
@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
|
||||
import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Folk
|
||||
@@ -298,7 +299,7 @@ public class SchemeBuffer extends Folk
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = Util.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -547,16 +547,6 @@ public class Util
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* This will sort a Map according to the values. Default sort direction is ascending.
|
||||
* @param <K> keyType
|
||||
|
@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
|
||||
import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Folk
|
||||
@@ -298,7 +299,7 @@ public class SchemeBuffer extends Folk
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = Util.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -547,16 +547,6 @@ public class Util
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* This will sort a Map according to the values. Default sort direction is ascending.
|
||||
* @param <K> keyType
|
||||
|
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
|
||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||
import org.l2jmobius.gameserver.model.skill.Skill;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import org.l2jmobius.gameserver.util.MathUtil;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
|
||||
public class SchemeBuffer extends Npc
|
||||
@@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc
|
||||
}
|
||||
|
||||
// Calculate page number.
|
||||
final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT);
|
||||
int page = pageValue;
|
||||
if (page > max)
|
||||
{
|
||||
@@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc
|
||||
return fee;
|
||||
}
|
||||
|
||||
private static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
private static int getCountOf(List<Integer> skills, boolean dances)
|
||||
{
|
||||
int count = 0;
|
||||
|
@@ -91,4 +91,14 @@ public class MathUtil
|
||||
{
|
||||
return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param objectsSize : The overall elements size.
|
||||
* @param pageSize : The number of elements per page.
|
||||
* @return The number of pages, based on the number of elements and the number of elements we want per page.
|
||||
*/
|
||||
public static int countPagesNumber(int objectsSize, int pageSize)
|
||||
{
|
||||
return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user