Skip to content

Commit

Permalink
Performance pass #2 (Collection.toArray() call style)
Browse files Browse the repository at this point in the history
Took 8 minutes
  • Loading branch information
Andrew committed Sep 12, 2020
1 parent 88054ad commit 9a7ab90
Show file tree
Hide file tree
Showing 25 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/react/api/Action.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public ISelector[] biselect(ISelector... selectors)
set.add(getDefaultSelectors().get(i).get());
}

return set.toArray(new ISelector[set.size()]);
return set.toArray(new ISelector[0]);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/react/command/CommandAct.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void fire(CommandSender sender, String[] args)
{
force = true;
ar.remove(ar.last());
args = ar.toArray(new String[ar.size()]);
args = ar.toArray(new String[0]);
}

if(args.length == 1)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/react/command/CommandFix.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ public void fire(CommandSender sender, String[] args)
String name = args[0];
GList<String> argx = new GList<String>(args);
argx.remove(0);
React.instance.fixController.runFix(sender, name, argx.toArray(new String[argx.size()]));
React.instance.fixController.runFix(sender, name, argx.toArray(new String[0]));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public void tick()
GTriset<ActionType, IActionSource, GList<ISelector>> i = pending.get(d);
IAction action = getAction(i.getA());
IActionSource source = i.getB();
ISelector[] selectors = i.getC().toArray(new ISelector[i.getC().size()]);
ISelector[] selectors = i.getC().toArray(new ISelector[0]);
boolean running = action.getState().equals(ActionState.IDLE);

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ else if(a.length > 0)
acts.add("a");
acts.addAll(new GList<String>(a));

onCommand(plr ? px : s, c, n, acts.toArray(new String[acts.size()])); // $NON-NLS-1$
onCommand(plr ? px : s, c, n, acts.toArray(new String[0])); // $NON-NLS-1$
}

else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public void toggleMapping(Player player, String[] args)
r.add(rp.pargs);
}

toggleMapping(player, r.toArray(new String[r.size()]));
toggleMapping(player, r.toArray(new String[0]));
return;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/volmit/react/util/Area.java
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public Entity[] getNearbyEntities(EntityType type)
}
}

return e.toArray(new Entity[e.size()]);
return e.toArray(new Entity[0]);
}

/**
Expand All @@ -161,7 +161,7 @@ public Entity[] getNearbyEntities(Class<? extends Entity> entityClass)
}
}

return e.toArray(new Entity[e.size()]);
return e.toArray(new Entity[0]);
}

/**
Expand Down Expand Up @@ -198,7 +198,7 @@ public Entity[] getNearbyEntities()
}
}

return radiusEntities.toArray(new Entity[radiusEntities.size()]);
return radiusEntities.toArray(new Entity[0]);
}

catch(Throwable e)
Expand All @@ -225,7 +225,7 @@ public Player[] getNearbyPlayers()
}
}

return px.toArray(new Player[px.size()]);
return px.toArray(new Player[0]);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public int getQueueSize()

public ParallelThread[] getThreads()
{
return threads.toArray(new ParallelThread[threads.size()]);
return threads.toArray(new ParallelThread[0]);
}

private void updateThreadInformation()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/react/xrai/VirtualAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void execute()
}
}

React.instance.actionController.fire(getActionType(), new RAIActionSource(), selectors.toArray(new ISelector[selectors.size()]));
React.instance.actionController.fire(getActionType(), new RAIActionSource(), selectors.toArray(new ISelector[0]));
}

public JSONObject toJSON()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/command/VirtualCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public boolean hit(CommandSender sender, GList<String> chain)
return true;
}

return command.handle(vs, chain.toArray(new String[chain.size()]));
return command.handle(vs, chain.toArray(new String[0]));
}

private boolean checkPermissions(CommandSender sender, ICommand command2)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst10.java
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst11.java
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst12.java
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst13_R2.java
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst14.java
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst15.java
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst16.java
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst16_R2.java
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst8.java
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Catalyst94.java
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ public void sendEntityMetadata(Player p, int eid, Object... objects)
@Override
public void sendEntityMetadata(Player p, int eid, List<Object> objects)
{
sendEntityMetadata(p, eid, objects.toArray(new Object[objects.size()]));
sendEntityMetadata(p, eid, objects.toArray(new Object[0]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/V.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public Object invoke(String method, Object... parameters)

try
{
return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class<?>[par.size()])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class<?>[par.size()]))).invoke(o, parameters);
return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class<?>[0])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class<?>[0]))).invoke(o, parameters);
}

catch(Throwable e)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/bukkit/nms/Violator.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static <T> T construct(Class<?> c, Object... parameters)

try
{
Constructor<?> co = getConstructor(c, cv.toArray(new Class<?>[cv.size()]));
Constructor<?> co = getConstructor(c, cv.toArray(new Class<?>[0]));
return (T) co.newInstance(parameters);
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/primal/bukkit/world/Area.java
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public Entity[] getNearbyEntities(EntityType type)
}
}

return e.toArray(new Entity[e.size()]);
return e.toArray(new Entity[0]);
}

/**
Expand All @@ -161,7 +161,7 @@ public Entity[] getNearbyEntities(Class<? extends Entity> entityClass)
}
}

return e.toArray(new Entity[e.size()]);
return e.toArray(new Entity[0]);
}

/**
Expand Down Expand Up @@ -193,7 +193,7 @@ public Entity[] getNearbyEntities()
}
}

return radiusEntities.toArray(new Entity[radiusEntities.size()]);
return radiusEntities.toArray(new Entity[0]);
}

catch(Exception e)
Expand All @@ -219,7 +219,7 @@ public Player[] getNearbyPlayers()
}
}

return px.toArray(new Player[px.size()]);
return px.toArray(new Player[0]);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/util/reflection/V.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public Object invoke(String method, Object... parameters)

try
{
return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class<?>[par.size()])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class<?>[par.size()]))).invoke(o, parameters);
return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class<?>[0])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class<?>[0]))).invoke(o, parameters);
}

catch(Throwable e)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/primal/util/reflection/Violator.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static <T> T construct(Class<?> c, Object... parameters)

try
{
Constructor<?> co = getConstructor(c, cv.toArray(new Class<?>[cv.size()]));
Constructor<?> co = getConstructor(c, cv.toArray(new Class<?>[0]));
return (T) co.newInstance(parameters);
}

Expand Down

0 comments on commit 9a7ab90

Please sign in to comment.