Partial sync L2jUnity free release Feb 16th 2015.
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
*/
|
||||
package com.l2jmobius.gameserver.util;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
@@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentAffect;
|
||||
import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
|
||||
import com.l2jmobius.gameserver.model.punishment.PunishmentType;
|
||||
import com.l2jmobius.gameserver.network.L2GameClient;
|
||||
import com.l2jmobius.util.StringUtil;
|
||||
|
||||
/**
|
||||
* Flood protector implementation.
|
||||
@@ -189,7 +189,9 @@ public final class FloodProtectorAction
|
||||
|
||||
private void log(String... lines)
|
||||
{
|
||||
final StringBuilder output = StringUtil.startAppend(100, _config.FLOOD_PROTECTOR_TYPE, ": ");
|
||||
final StringBuilder output = new StringBuilder(100);
|
||||
output.append(_config.FLOOD_PROTECTOR_TYPE);
|
||||
output.append(": ");
|
||||
String address = null;
|
||||
try
|
||||
{
|
||||
@@ -208,8 +210,10 @@ public final class FloodProtectorAction
|
||||
{
|
||||
if (_client.getActiveChar() != null)
|
||||
{
|
||||
StringUtil.append(output, _client.getActiveChar().getName());
|
||||
StringUtil.append(output, "(", String.valueOf(_client.getActiveChar().getObjectId()), ") ");
|
||||
output.append(_client.getActiveChar().getName());
|
||||
output.append("(");
|
||||
output.append(_client.getActiveChar().getObjectId());
|
||||
output.append(") ");
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -217,7 +221,8 @@ public final class FloodProtectorAction
|
||||
{
|
||||
if (_client.getAccountName() != null)
|
||||
{
|
||||
StringUtil.append(output, _client.getAccountName(), " ");
|
||||
output.append(_client.getAccountName());
|
||||
output.append(" ");
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -225,7 +230,7 @@ public final class FloodProtectorAction
|
||||
{
|
||||
if (address != null)
|
||||
{
|
||||
StringUtil.append(output, address);
|
||||
output.append(address);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -235,7 +240,8 @@ public final class FloodProtectorAction
|
||||
}
|
||||
}
|
||||
|
||||
StringUtil.append(output, lines);
|
||||
Arrays.stream(lines).forEach(output::append);
|
||||
|
||||
_log.warning(output.toString());
|
||||
}
|
||||
}
|
@@ -21,7 +21,6 @@ import java.util.Collection;
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.l2jmobius.gameserver.model.PageResult;
|
||||
import com.l2jmobius.util.StringUtil;
|
||||
|
||||
/**
|
||||
* A class containing useful methods for constructing HTML
|
||||
@@ -163,20 +162,62 @@ public class HtmlUtil
|
||||
{
|
||||
current = Math.min(current, max);
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
StringUtil.append(sb, "<table width=", String.valueOf(width), " cellpadding=0 cellspacing=0><tr><td background=\"" + backgroundImage + "\">");
|
||||
StringUtil.append(sb, "<img src=\"" + image + "\" width=", String.valueOf((long) (((double) current / max) * width)), " height=", String.valueOf(imageHeight), ">");
|
||||
StringUtil.append(sb, "</td></tr><tr><td align=center><table cellpadding=0 cellspacing=", String.valueOf(top), "><tr><td>");
|
||||
sb.append("<table width=");
|
||||
sb.append(width);
|
||||
sb.append(" cellpadding=0 cellspacing=0>");
|
||||
sb.append("<tr>");
|
||||
sb.append("<td background=\"");
|
||||
sb.append(backgroundImage);
|
||||
sb.append("\">");
|
||||
sb.append("<img src=\"");
|
||||
sb.append(image);
|
||||
sb.append("\" width=");
|
||||
sb.append((long) (((double) current / max) * width));
|
||||
sb.append(" height=");
|
||||
sb.append(imageHeight);
|
||||
sb.append(">");
|
||||
sb.append("</td>");
|
||||
sb.append("</tr>");
|
||||
sb.append("<tr>");
|
||||
sb.append("<td align=center>");
|
||||
sb.append("<table cellpadding=0 cellspacing=");
|
||||
sb.append(top);
|
||||
sb.append(">");
|
||||
sb.append("<tr>");
|
||||
sb.append("<td>");
|
||||
if (displayAsPercentage)
|
||||
{
|
||||
StringUtil.append(sb, "<table cellpadding=0 cellspacing=2><tr><td>", String.format("%.2f%%", ((double) current / max) * 100), "</td></tr></table>");
|
||||
sb.append("<table cellpadding=0 cellspacing=2>");
|
||||
sb.append("<tr><td>");
|
||||
sb.append(String.format("%.2f%%", ((double) current / max) * 100));
|
||||
sb.append("</td></tr>");
|
||||
sb.append("</table>");
|
||||
}
|
||||
else
|
||||
{
|
||||
final String tdWidth = String.valueOf((width - 10) / 2);
|
||||
StringUtil.append(sb, "<table cellpadding=0 cellspacing=0><tr><td width=" + tdWidth + " align=right>", String.valueOf(current), "</td>");
|
||||
StringUtil.append(sb, "<td width=10 align=center>/</td><td width=" + tdWidth + ">", String.valueOf(max), "</td></tr></table>");
|
||||
int tdWidth = (width - 10) / 2;
|
||||
sb.append("<table cellpadding=0 cellspacing=0>");
|
||||
sb.append("<tr>");
|
||||
sb.append("<td width=");
|
||||
sb.append(tdWidth);
|
||||
sb.append(" align=right>");
|
||||
sb.append(current);
|
||||
sb.append("</td>");
|
||||
sb.append("<td width=10 align=center>/</td>");
|
||||
sb.append("<td width=");
|
||||
sb.append(tdWidth);
|
||||
sb.append(">");
|
||||
sb.append(max);
|
||||
sb.append("</td>");
|
||||
sb.append("</tr>");
|
||||
sb.append("</table>");
|
||||
}
|
||||
StringUtil.append(sb, "</td></tr></table></td></tr></table>");
|
||||
sb.append("</td>");
|
||||
sb.append("</tr>");
|
||||
sb.append("</table>");
|
||||
sb.append("</td>");
|
||||
sb.append("</tr>");
|
||||
sb.append("</table>");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user