TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize work with lists

Browse Source
This commit is contained in:
serso
2016-01-24 22:52:55 +01:00
parent 88c1253609
commit c000a525db
12 changed files with 97 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jscl/src/main/java/jscl/text/ExceptionsPool.java
View File

@@ -1,7 +1,9 @@
package jscl.text;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -15,6 +17,11 @@ public class ExceptionsPool {
return obtain(position, expression, messageCode, Collections.emptyList());
}
@Nonnull
public ParseException obtain(int position, @Nonnull String expression, @Nonnull String messageCode, @Nullable Object[] messageArgs) {
return obtain(position, expression, messageCode, messageArgs == null || messageArgs.length == 0 ? java.util.Collections.emptyList() : Arrays.asList(messageArgs));
}
@Nonnull
public ParseException obtain(int position, @Nonnull String expression, @Nonnull String messageCode, @Nonnull List<?> messagesArgs) {
final ParseException exception = !list.isEmpty() ? list.remove(list.size() - 1) : new ParseException();

4
jscl/src/main/java/jscl/text/ParseException.java
View File

@@ -1,12 +1,12 @@
package jscl.text;
import org.solovyev.common.collections.Collections;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageLevel;
import org.solovyev.common.msg.MessageType;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -25,7 +25,7 @@ public class ParseException extends Exception implements Message {
}
public ParseException(int position, @Nonnull String expression, @Nonnull String messageCode, @Nullable Object... parameters) {
set(position, expression, messageCode, Collections.asList(parameters));
set(position, expression, messageCode, parameters == null || parameters.length == 0 ? java.util.Collections.emptyList() : Arrays.asList(parameters));
}
void set(int position, @Nonnull String expression, @Nonnull String messageCode, @Nonnull List<?> parameters) {

3
jscl/src/main/java/jscl/text/ParserUtils.java
View File

@@ -2,7 +2,6 @@ package jscl.text;
import jscl.math.Generic;
import jscl.text.msg.Messages;
import org.solovyev.common.collections.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -68,7 +67,7 @@ public class ParserUtils {
@Nonnull String messageId,
Object... parameters) throws ParseException {
final MutableInt position = p.position;
final ParseException parseException = p.exceptionsPool.obtain(position.intValue(), p.expression, messageId, Collections.asList(parameters));
final ParseException parseException = p.exceptionsPool.obtain(position.intValue(), p.expression, messageId, parameters);
position.setValue(pos0);
throw parseException;
}

61
jscl/src/main/java/org/solovyev/common/math/AbstractMathRegistry.java
View File

@@ -23,20 +23,16 @@
package org.solovyev.common.math;
import org.solovyev.common.JBuilder;
import org.solovyev.common.JPredicate;
import org.solovyev.common.collections.Collections;
import org.solovyev.common.collections.SortedList;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import static org.solovyev.common.collections.Collections.find;
import static org.solovyev.common.collections.Collections.removeFirst;
/**
* User: serso
* Date: 9/29/11
@@ -53,6 +49,9 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
protected final SortedList<T> entities = SortedList.newInstance(new ArrayList<T>(30), MATH_ENTITY_COMPARATOR);
@GuardedBy("this")
@Nonnull
protected final List<String> entityNames = new ArrayList<>();
@GuardedBy("this")
@Nonnull
protected final SortedList<T> systemEntities = SortedList.newInstance(new ArrayList<T>(30), MATH_ENTITY_COMPARATOR);
protected AbstractMathRegistry() {
@@ -91,6 +90,7 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
if (!contains(entity.getName(), this.entities)) {
addEntity(entity, this.entities);
this.entityNames.clear();
}
}
}
@@ -118,13 +118,14 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
varFromRegister = entity;
addEntity(entity, this.entities);
this.entityNames.clear();
if (entity.isSystem()) {
this.systemEntities.add(entity);
}
} else {
varFromRegister.copy(entity);
this.entities.sort();
this.entityNames.clear();
this.systemEntities.sort();
}
@@ -135,38 +136,56 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
public void remove(@Nonnull T entity) {
synchronized (this) {
if (!entity.isSystem()) {
removeFirst(this.entities, new MathEntity.Finder<T>(entity.getName()));
final T removed = Collections.removeFirst(this.entities, new MathEntity.Finder<T>(entity.getName()));
if(removed != null) {
this.entityNames.clear();
}
}
}
}
@Nonnull
public List<String> getNames() {
final List<String> result = new ArrayList<String>(entities.size());
synchronized (this) {
for (T entity : entities) {
result.add(entity.getName());
if (entityNames.isEmpty()) {
for (T entity : entities) {
entityNames.add(entity.getName());
}
}
return entityNames;
}
return result;
}
@Nullable
public T get(@Nonnull final String name) {
synchronized (this) {
return find(entities, new MathEntity.Finder<T>(name));
return get(name, entities);
}
}
@Nullable
private T get(@Nonnull String name, @Nonnull List<T> list) {
for (int i = 0; i < list.size(); i++) {
final T entity = list.get(i);
if (areEqual(entity.getName(), name)) {
return entity;
}
}
return null;
}
private static boolean areEqual(@Nullable Object l, @Nullable Object r) {
return l != null ? l.equals(r) : r == null;
}
public T getById(@Nonnull final Integer id) {
synchronized (this) {
return find(entities, new JPredicate<T>() {
public boolean apply(@Nullable T t) {
return t != null && t.getId().equals(id);
for (T entity : entities) {
if (areEqual(entity.getId(), id)) {
return entity;
}
});
}
return null;
}
}
@@ -176,10 +195,8 @@ public abstract class AbstractMathRegistry<T extends MathEntity> implements Math
}
}
private boolean contains(final String name, @Nonnull Collection<T> entities) {
synchronized (this) {
return find(entities, new MathEntity.Finder<T>(name)) != null;
}
private boolean contains(final String name, @Nonnull List<T> entities) {
return get(name, entities) != null;
}
static class MathEntityComparator<T extends MathEntity> implements Comparator<T> {