Skip to content
Snippets Groups Projects
Commit 0f35fc76 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed several bugs in reflection and reformatted code

parent 8b2e284e
No related branches found
No related tags found
No related merge requests found
Showing
with 126 additions and 134 deletions
package de.kuschku.libquassel; package de.kuschku.libquassel;
import android.util.Log;
import java.util.UUID; import java.util.UUID;
import de.greenrobot.event.EventBus; import de.greenrobot.event.EventBus;
......
package de.kuschku.libquassel; package de.kuschku.libquassel;
import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
...@@ -23,7 +21,6 @@ import de.kuschku.libquassel.primitives.types.Message; ...@@ -23,7 +21,6 @@ import de.kuschku.libquassel.primitives.types.Message;
import de.kuschku.libquassel.primitives.types.QVariant; import de.kuschku.libquassel.primitives.types.QVariant;
import de.kuschku.libquassel.syncables.types.BufferSyncer; import de.kuschku.libquassel.syncables.types.BufferSyncer;
import de.kuschku.libquassel.syncables.types.BufferViewManager; import de.kuschku.libquassel.syncables.types.BufferViewManager;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.libquassel.syncables.types.Network; import de.kuschku.libquassel.syncables.types.Network;
import de.kuschku.libquassel.syncables.types.SyncableObject; import de.kuschku.libquassel.syncables.types.SyncableObject;
import de.kuschku.util.Stream; import de.kuschku.util.Stream;
...@@ -35,6 +32,7 @@ public class Client { ...@@ -35,6 +32,7 @@ public class Client {
private final List<String> initDataQueue = new ArrayList<>(); private final List<String> initDataQueue = new ArrayList<>();
private final BacklogManager backlogManager; private final BacklogManager backlogManager;
private final BusProvider busProvider; private final BusProvider busProvider;
public int lag;
private ConnectionChangeEvent.Status connectionStatus; private ConnectionChangeEvent.Status connectionStatus;
private ClientInitAck core; private ClientInitAck core;
private SessionState state; private SessionState state;
...@@ -42,8 +40,6 @@ public class Client { ...@@ -42,8 +40,6 @@ public class Client {
private BufferSyncer bufferSyncer; private BufferSyncer bufferSyncer;
private ClientData clientData; private ClientData clientData;
public int lag;
public Client(final BusProvider busProvider) { public Client(final BusProvider busProvider) {
this(new SimpleBacklogManager(busProvider), busProvider); this(new SimpleBacklogManager(busProvider), busProvider);
} }
...@@ -176,11 +172,6 @@ public class Client { ...@@ -176,11 +172,6 @@ public class Client {
this.core = core; this.core = core;
} }
public void setConnectionStatus(final ConnectionChangeEvent.Status connectionStatus) {
this.connectionStatus = connectionStatus;
busProvider.sendEvent(new ConnectionChangeEvent(connectionStatus));
}
public void setClientData(ClientData clientData) { public void setClientData(ClientData clientData) {
this.clientData = clientData; this.clientData = clientData;
} }
...@@ -196,4 +187,9 @@ public class Client { ...@@ -196,4 +187,9 @@ public class Client {
public ConnectionChangeEvent.Status getConnectionStatus() { public ConnectionChangeEvent.Status getConnectionStatus() {
return connectionStatus; return connectionStatus;
} }
public void setConnectionStatus(final ConnectionChangeEvent.Status connectionStatus) {
this.connectionStatus = connectionStatus;
busProvider.sendEvent(new ConnectionChangeEvent(connectionStatus));
}
} }
...@@ -12,13 +12,13 @@ import de.kuschku.libquassel.functions.types.InitDataFunction; ...@@ -12,13 +12,13 @@ import de.kuschku.libquassel.functions.types.InitDataFunction;
import de.kuschku.libquassel.functions.types.InitRequestFunction; import de.kuschku.libquassel.functions.types.InitRequestFunction;
import de.kuschku.libquassel.functions.types.RpcCallFunction; import de.kuschku.libquassel.functions.types.RpcCallFunction;
import de.kuschku.libquassel.functions.types.SyncFunction; import de.kuschku.libquassel.functions.types.SyncFunction;
import de.kuschku.libquassel.syncables.SyncableRegistry;
import de.kuschku.libquassel.objects.types.ClientInitAck; import de.kuschku.libquassel.objects.types.ClientInitAck;
import de.kuschku.libquassel.objects.types.ClientInitReject; import de.kuschku.libquassel.objects.types.ClientInitReject;
import de.kuschku.libquassel.objects.types.ClientLoginAck; import de.kuschku.libquassel.objects.types.ClientLoginAck;
import de.kuschku.libquassel.objects.types.ClientLoginReject; import de.kuschku.libquassel.objects.types.ClientLoginReject;
import de.kuschku.libquassel.objects.types.SessionInit; import de.kuschku.libquassel.objects.types.SessionInit;
import de.kuschku.libquassel.primitives.types.BufferInfo; import de.kuschku.libquassel.primitives.types.BufferInfo;
import de.kuschku.libquassel.syncables.SyncableRegistry;
import de.kuschku.util.ReflectionUtils; import de.kuschku.util.ReflectionUtils;
public class ProtocolHandler implements IProtocolHandler { public class ProtocolHandler implements IProtocolHandler {
......
...@@ -6,6 +6,10 @@ public class SyncInvocationException extends InvocationTargetException { ...@@ -6,6 +6,10 @@ public class SyncInvocationException extends InvocationTargetException {
public SyncInvocationException() { public SyncInvocationException() {
} }
public SyncInvocationException(String detailMessage) {
super(null, detailMessage);
}
public SyncInvocationException(Throwable exception) { public SyncInvocationException(Throwable exception) {
super(exception); super(exception);
} }
......
...@@ -2,20 +2,20 @@ package de.kuschku.libquassel.localtypes; ...@@ -2,20 +2,20 @@ package de.kuschku.libquassel.localtypes;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import de.kuschku.libquassel.syncables.types.IrcChannel;
import de.kuschku.libquassel.primitives.types.BufferInfo; import de.kuschku.libquassel.primitives.types.BufferInfo;
import de.kuschku.libquassel.syncables.types.IrcChannel;
import de.kuschku.quasseldroid_ng.BufferDrawerItem; import de.kuschku.quasseldroid_ng.BufferDrawerItem;
public class ChannelBuffer implements Buffer { public class ChannelBuffer implements Buffer {
private final BufferInfo info; private final BufferInfo info;
private IrcChannel channel; private IrcChannel channel;
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public ChannelBuffer(BufferInfo info, IrcChannel channel) { public ChannelBuffer(BufferInfo info, IrcChannel channel) {
this.info = info; this.info = info;
this.channel = channel; this.channel = channel;
} }
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public IDrawerItem getDrawerElement() { public IDrawerItem getDrawerElement() {
return drawerElement; return drawerElement;
} }
......
...@@ -2,20 +2,20 @@ package de.kuschku.libquassel.localtypes; ...@@ -2,20 +2,20 @@ package de.kuschku.libquassel.localtypes;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.libquassel.primitives.types.BufferInfo; import de.kuschku.libquassel.primitives.types.BufferInfo;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.quasseldroid_ng.BufferDrawerItem; import de.kuschku.quasseldroid_ng.BufferDrawerItem;
public class QueryBuffer implements Buffer { public class QueryBuffer implements Buffer {
private final BufferInfo info; private final BufferInfo info;
private IrcUser user; private IrcUser user;
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public QueryBuffer(BufferInfo info, IrcUser user) { public QueryBuffer(BufferInfo info, IrcUser user) {
this.info = info; this.info = info;
this.user = user; this.user = user;
} }
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public IDrawerItem getDrawerElement() { public IDrawerItem getDrawerElement() {
return drawerElement; return drawerElement;
} }
......
...@@ -9,13 +9,13 @@ import de.kuschku.quasseldroid_ng.BufferDrawerItem; ...@@ -9,13 +9,13 @@ import de.kuschku.quasseldroid_ng.BufferDrawerItem;
public class StatusBuffer implements Buffer { public class StatusBuffer implements Buffer {
private final BufferInfo info; private final BufferInfo info;
private final Network network; private final Network network;
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public StatusBuffer(BufferInfo info, Network network) { public StatusBuffer(BufferInfo info, Network network) {
this.info = info; this.info = info;
this.network = network; this.network = network;
} }
private IDrawerItem drawerElement = new BufferDrawerItem(this);
public IDrawerItem getDrawerElement() { public IDrawerItem getDrawerElement() {
return drawerElement; return drawerElement;
} }
......
...@@ -38,21 +38,23 @@ import de.kuschku.libquassel.primitives.serializers.PrimitiveSerializer; ...@@ -38,21 +38,23 @@ import de.kuschku.libquassel.primitives.serializers.PrimitiveSerializer;
public class QMetaType<T> { public class QMetaType<T> {
public final Type type; public final Type type;
public final String name; public final String name;
public final Class cl;
public final PrimitiveSerializer<T> serializer; public final PrimitiveSerializer<T> serializer;
public QMetaType(Type type) { public QMetaType(Class cl, Type type) {
this(type, type.getSerializableName()); this(cl, type, type.getSerializableName());
} }
public QMetaType(Type type, String name) { public QMetaType(Class cl, Type type, String name) {
this(type, name, null); this(cl, type, name, null);
} }
public QMetaType(Type type, PrimitiveSerializer<T> serializer) { public QMetaType(Class cl, Type type, PrimitiveSerializer<T> serializer) {
this(type, type.getSerializableName(), serializer); this(cl, type, type.getSerializableName(), serializer);
} }
public QMetaType(Type type, String name, PrimitiveSerializer<T> serializer) { public QMetaType(Class cl, Type type, String name, PrimitiveSerializer<T> serializer) {
this.cl = cl;
this.type = type; this.type = type;
this.name = name; this.name = name;
this.serializer = serializer; this.serializer = serializer;
......
...@@ -3,6 +3,7 @@ package de.kuschku.libquassel.primitives; ...@@ -3,6 +3,7 @@ package de.kuschku.libquassel.primitives;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel; import java.nio.channels.ByteChannel;
import java.util.HashMap; import java.util.HashMap;
...@@ -42,85 +43,85 @@ public class QMetaTypeRegistry { ...@@ -42,85 +43,85 @@ public class QMetaTypeRegistry {
private static final Map<String, QMetaType> stringSerializerMap = new HashMap<>(); private static final Map<String, QMetaType> stringSerializerMap = new HashMap<>();
static { static {
addType(QMetaType.Type.Void, new VoidSerializer()); addType(Void.class, QMetaType.Type.Void, new VoidSerializer());
addType(QMetaType.Type.Bool, new BoolSerializer()); addType(boolean.class, QMetaType.Type.Bool, new BoolSerializer());
addType(QMetaType.Type.Int, new IntSerializer()); addType(int.class, QMetaType.Type.Int, new IntSerializer());
addType(QMetaType.Type.UserType, "BufferId", new IntSerializer()); addType(int.class, QMetaType.Type.UserType, "BufferId", new IntSerializer());
addType(QMetaType.Type.UserType, "NetworkId", new IntSerializer()); addType(int.class, QMetaType.Type.UserType, "NetworkId", new IntSerializer());
addType(QMetaType.Type.UserType, "IdentityId", new IntSerializer()); addType(int.class, QMetaType.Type.UserType, "IdentityId", new IntSerializer());
addType(QMetaType.Type.UserType, "MsgId", new IntSerializer()); addType(int.class, QMetaType.Type.UserType, "MsgId", new IntSerializer());
addType(QMetaType.Type.UserType, "BufferInfo", new BufferInfoSerializer()); addType(BufferInfo.class, QMetaType.Type.UserType, "BufferInfo", new BufferInfoSerializer());
addType(QMetaType.Type.UserType, "Message", new MessageSerializer()); addType(Message.class, QMetaType.Type.UserType, "Message", new MessageSerializer());
addType(QMetaType.Type.UserType, "Identity", new UserTypeSerializer<>(new IdentitySerializer())); addType(Identity.class, QMetaType.Type.UserType, "Identity", new UserTypeSerializer<>(new IdentitySerializer()));
addType(QMetaType.Type.UserType, "Network::Server", new UserTypeSerializer<>(new NetworkServerSerializer())); addType(NetworkServer.class, QMetaType.Type.UserType, "Network::Server", new UserTypeSerializer<>(new NetworkServerSerializer()));
addType(QMetaType.Type.UInt, new IntSerializer()); addType(int.class, QMetaType.Type.UInt, new IntSerializer());
addType(QMetaType.Type.UShort, new ShortSerializer()); addType(short.class, QMetaType.Type.UShort, new ShortSerializer());
// TODO: Implement more custom quassel types // TODO: Implement more custom quassel types
addType(QMetaType.Type.QTime, new TimeSerializer()); addType(DateTime.class, QMetaType.Type.QTime, new TimeSerializer());
addType(QMetaType.Type.LongLong); addType(BigDecimal.class, QMetaType.Type.LongLong);
addType(QMetaType.Type.ULongLong); addType(BigDecimal.class, QMetaType.Type.ULongLong);
addType(QMetaType.Type.Double); addType(double.class, QMetaType.Type.Double);
addType(QMetaType.Type.QChar, new CharSerializer()); addType(char.class, QMetaType.Type.QChar, new CharSerializer());
addType(QMetaType.Type.QVariantList, new VariantListSerializer<>()); addType(List.class, QMetaType.Type.QVariantList, new VariantListSerializer());
addType(QMetaType.Type.QVariantMap, new VariantMapSerializer<>()); addType(Map.class, QMetaType.Type.QVariantMap, new VariantMapSerializer());
addType(QMetaType.Type.QStringList, new StringListSerializer()); addType(List.class, QMetaType.Type.QStringList, new StringListSerializer());
addType(QMetaType.Type.QString, new StringSerializer()); addType(String.class, QMetaType.Type.QString, new StringSerializer());
addType(QMetaType.Type.QByteArray, new ByteArraySerializer()); addType(String.class, QMetaType.Type.QByteArray, new ByteArraySerializer());
addType(QMetaType.Type.QBitArray); addType(void.class, QMetaType.Type.QBitArray);
addType(QMetaType.Type.QDate); addType(void.class, QMetaType.Type.QDate);
addType(QMetaType.Type.QDateTime, new DateTimeSerializer()); addType(DateTime.class, QMetaType.Type.QDateTime, new DateTimeSerializer());
addType(QMetaType.Type.QUrl); addType(void.class, QMetaType.Type.QUrl);
addType(QMetaType.Type.QLocale); addType(void.class, QMetaType.Type.QLocale);
addType(QMetaType.Type.QRect); addType(void.class, QMetaType.Type.QRect);
addType(QMetaType.Type.QRectF); addType(void.class, QMetaType.Type.QRectF);
addType(QMetaType.Type.QSize); addType(void.class, QMetaType.Type.QSize);
addType(QMetaType.Type.QSizeF); addType(void.class, QMetaType.Type.QSizeF);
addType(QMetaType.Type.QLine); addType(void.class, QMetaType.Type.QLine);
addType(QMetaType.Type.QLineF); addType(void.class, QMetaType.Type.QLineF);
addType(QMetaType.Type.QPoint); addType(void.class, QMetaType.Type.QPoint);
addType(QMetaType.Type.QPointF); addType(void.class, QMetaType.Type.QPointF);
// TODO: Handle QRegExp for the IgnoreListManager // TODO: Handle QRegExp for the IgnoreListManager
addType(QMetaType.Type.QRegExp); addType(void.class, QMetaType.Type.QRegExp);
addType(QMetaType.Type.QVariantHash); addType(void.class, QMetaType.Type.QVariantHash);
addType(QMetaType.Type.QEasingCurve); addType(void.class, QMetaType.Type.QEasingCurve);
// UI Types // UI Types
addType(QMetaType.Type.QFont); addType(void.class, QMetaType.Type.QFont);
addType(QMetaType.Type.QPixmap); addType(void.class, QMetaType.Type.QPixmap);
addType(QMetaType.Type.QBrush); addType(void.class, QMetaType.Type.QBrush);
addType(QMetaType.Type.QColor); addType(void.class, QMetaType.Type.QColor);
addType(QMetaType.Type.QPalette); addType(void.class, QMetaType.Type.QPalette);
addType(QMetaType.Type.QIcon); addType(void.class, QMetaType.Type.QIcon);
addType(QMetaType.Type.QImage); addType(void.class, QMetaType.Type.QImage);
addType(QMetaType.Type.QPolygon); addType(void.class, QMetaType.Type.QPolygon);
addType(QMetaType.Type.QRegion); addType(void.class, QMetaType.Type.QRegion);
addType(QMetaType.Type.QBitmap); addType(void.class, QMetaType.Type.QBitmap);
addType(QMetaType.Type.QCursor); addType(void.class, QMetaType.Type.QCursor);
addType(QMetaType.Type.QSizePolicy); addType(void.class, QMetaType.Type.QSizePolicy);
addType(QMetaType.Type.QKeySequence); addType(void.class, QMetaType.Type.QKeySequence);
addType(QMetaType.Type.QPen); addType(void.class, QMetaType.Type.QPen);
addType(QMetaType.Type.QTextLength); addType(void.class, QMetaType.Type.QTextLength);
addType(QMetaType.Type.QTextFormat); addType(void.class, QMetaType.Type.QTextFormat);
addType(QMetaType.Type.QMatrix); addType(void.class, QMetaType.Type.QMatrix);
addType(QMetaType.Type.QTransform); addType(void.class, QMetaType.Type.QTransform);
addType(QMetaType.Type.QMatrix4x4); addType(void.class, QMetaType.Type.QMatrix4x4);
addType(QMetaType.Type.QVector2D); addType(void.class, QMetaType.Type.QVector2D);
addType(QMetaType.Type.QVector3D); addType(void.class, QMetaType.Type.QVector3D);
addType(QMetaType.Type.QVector4D); addType(void.class, QMetaType.Type.QVector4D);
addType(QMetaType.Type.QQuaternion); addType(void.class, QMetaType.Type.QQuaternion);
addType(QMetaType.Type.VoidStar, "void*"); addType(void.class, QMetaType.Type.VoidStar, "void*");
addType(QMetaType.Type.Long, new LongSerializer()); addType(long.class, QMetaType.Type.Long, new LongSerializer());
addType(QMetaType.Type.Short, new ShortSerializer()); addType(short.class, QMetaType.Type.Short, new ShortSerializer());
addType(QMetaType.Type.Char, new ByteSerializer()); addType(byte.class, QMetaType.Type.Char, new ByteSerializer());
addType(QMetaType.Type.ULong, new LongSerializer()); addType(long.class, QMetaType.Type.ULong, new LongSerializer());
addType(QMetaType.Type.UChar, new ByteSerializer()); addType(byte.class, QMetaType.Type.UChar, new ByteSerializer());
addType(QMetaType.Type.Float); addType(void.class, QMetaType.Type.Float);
addType(QMetaType.Type.QObjectStar, "QObject*"); addType(void.class, QMetaType.Type.QObjectStar, "QObject*");
addType(QMetaType.Type.QWidgetStar, "QWidget*"); addType(void.class, QMetaType.Type.QWidgetStar, "QWidget*");
addType(QMetaType.Type.QVariant, new VariantSerializer()); addType(QVariant.class, QMetaType.Type.QVariant, new VariantSerializer());
} }
// Disable Constructor // Disable Constructor
...@@ -128,20 +129,20 @@ public class QMetaTypeRegistry { ...@@ -128,20 +129,20 @@ public class QMetaTypeRegistry {
} }
private static <T> void addType(final QMetaType.Type type, final String name, final PrimitiveSerializer<T> serializer) { private static <T> void addType(final Class cl, final QMetaType.Type type, final String name, final PrimitiveSerializer<T> serializer) {
addType(new QMetaType<T>(type, name, serializer)); addType(new QMetaType<T>(cl, type, name, serializer));
} }
private static <T> void addType(final QMetaType.Type type, final String name) { private static <T> void addType(final Class cl, final QMetaType.Type type, final String name) {
addType(new QMetaType<T>(type, name)); addType(new QMetaType<T>(cl, type, name));
} }
private static <T> void addType(final QMetaType.Type type, final PrimitiveSerializer<T> serializer) { private static <T> void addType(final Class cl, final QMetaType.Type type, final PrimitiveSerializer<T> serializer) {
addType(new QMetaType<T>(type, serializer)); addType(new QMetaType<T>(cl, type, serializer));
} }
private static <T> void addType(final QMetaType.Type type) { private static <T> void addType(final Class cl, final QMetaType.Type type) {
addType(new QMetaType<T>(type)); addType(new QMetaType<T>(cl, type));
} }
private static <T> void addType(final QMetaType<T> metaType) { private static <T> void addType(final QMetaType<T> metaType) {
...@@ -213,7 +214,7 @@ public class QMetaTypeRegistry { ...@@ -213,7 +214,7 @@ public class QMetaTypeRegistry {
if (((List) type).size() > 0 && ((List) type).get(0) instanceof String) if (((List) type).size() > 0 && ((List) type).get(0) instanceof String)
return (QMetaType<T>) typeSerializerMap.get(QMetaType.Type.QStringList); return (QMetaType<T>) typeSerializerMap.get(QMetaType.Type.QStringList);
else if (((List) type).size() > 0 && ((List) type).get(0) instanceof QVariant) else if (((List) type).size() > 0 && ((List) type).get(0) instanceof QVariant)
return (QMetaType<T>) new QMetaType<T>(QMetaType.Type.QVariantList, new VariantVariantListSerializer()); return new QMetaType<>((Class) type.getClass(), QMetaType.Type.QVariantList, new VariantVariantListSerializer());
else else
return (QMetaType<T>) typeSerializerMap.get(QMetaType.Type.QVariantList); return (QMetaType<T>) typeSerializerMap.get(QMetaType.Type.QVariantList);
} else if (type instanceof Map) } else if (type instanceof Map)
......
...@@ -2,8 +2,6 @@ package de.kuschku.libquassel.primitives.types; ...@@ -2,8 +2,6 @@ package de.kuschku.libquassel.primitives.types;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.mikepenz.fastadapter.IItem;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import java.io.Serializable; import java.io.Serializable;
......
...@@ -56,7 +56,7 @@ public class LegacyPeer implements RemotePeer { ...@@ -56,7 +56,7 @@ public class LegacyPeer implements RemotePeer {
public final void onEventBackgroundThread(SyncFunction func) { public final void onEventBackgroundThread(SyncFunction func) {
final List serialize = new UnpackedSyncFunctionSerializer().serialize(func); final List serialize = new UnpackedSyncFunctionSerializer().serialize(func);
connection.getOutputExecutor().submit(new OutputRunnable<>(new VariantSerializer<List>(), connection.getOutputExecutor().submit(new OutputRunnable<>(new VariantSerializer<List>(),
new QVariant<>(new QMetaType<List>(QMetaType.Type.QVariantList, new VariantVariantListSerializer()), new QVariant<>(new QMetaType<List>(List.class, QMetaType.Type.QVariantList, new VariantVariantListSerializer()),
serialize))); serialize)));
} }
......
...@@ -17,6 +17,7 @@ import de.kuschku.libquassel.syncables.types.SyncableObject; ...@@ -17,6 +17,7 @@ import de.kuschku.libquassel.syncables.types.SyncableObject;
public class SyncableRegistry { public class SyncableRegistry {
private static final Map<String, ObjectSerializer<? extends SyncableObject>> map = new HashMap<>(); private static final Map<String, ObjectSerializer<? extends SyncableObject>> map = new HashMap<>();
static { static {
map.put("BufferSyncer", new BufferSyncerSerializer()); map.put("BufferSyncer", new BufferSyncerSerializer());
map.put("BufferViewConfig", new BufferViewConfigSerializer()); map.put("BufferViewConfig", new BufferViewConfigSerializer());
......
...@@ -8,8 +8,8 @@ import de.kuschku.libquassel.functions.types.SerializedFunction; ...@@ -8,8 +8,8 @@ import de.kuschku.libquassel.functions.types.SerializedFunction;
import de.kuschku.libquassel.functions.types.UnpackedFunction; import de.kuschku.libquassel.functions.types.UnpackedFunction;
import de.kuschku.libquassel.objects.serializers.ObjectSerializer; import de.kuschku.libquassel.objects.serializers.ObjectSerializer;
import de.kuschku.libquassel.objects.serializers.StringObjectMapSerializer; import de.kuschku.libquassel.objects.serializers.StringObjectMapSerializer;
import de.kuschku.libquassel.syncables.types.IrcChannel;
import de.kuschku.libquassel.primitives.types.QVariant; import de.kuschku.libquassel.primitives.types.QVariant;
import de.kuschku.libquassel.syncables.types.IrcChannel;
public class IrcChannelSerializer implements ObjectSerializer<IrcChannel> { public class IrcChannelSerializer implements ObjectSerializer<IrcChannel> {
@Override @Override
......
...@@ -10,8 +10,8 @@ import de.kuschku.libquassel.functions.types.PackedFunction; ...@@ -10,8 +10,8 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
import de.kuschku.libquassel.functions.types.SerializedFunction; import de.kuschku.libquassel.functions.types.SerializedFunction;
import de.kuschku.libquassel.functions.types.UnpackedFunction; import de.kuschku.libquassel.functions.types.UnpackedFunction;
import de.kuschku.libquassel.objects.serializers.ObjectSerializer; import de.kuschku.libquassel.objects.serializers.ObjectSerializer;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.libquassel.primitives.types.QVariant; import de.kuschku.libquassel.primitives.types.QVariant;
import de.kuschku.libquassel.syncables.types.IrcUser;
public class IrcUserSerializer implements ObjectSerializer<IrcUser> { public class IrcUserSerializer implements ObjectSerializer<IrcUser> {
@Override @Override
......
...@@ -12,10 +12,10 @@ import de.kuschku.libquassel.functions.types.SerializedFunction; ...@@ -12,10 +12,10 @@ import de.kuschku.libquassel.functions.types.SerializedFunction;
import de.kuschku.libquassel.functions.types.UnpackedFunction; import de.kuschku.libquassel.functions.types.UnpackedFunction;
import de.kuschku.libquassel.objects.serializers.ObjectSerializer; import de.kuschku.libquassel.objects.serializers.ObjectSerializer;
import de.kuschku.libquassel.objects.serializers.StringObjectMapSerializer; import de.kuschku.libquassel.objects.serializers.StringObjectMapSerializer;
import de.kuschku.libquassel.syncables.types.IrcChannel;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.libquassel.objects.types.NetworkServer; import de.kuschku.libquassel.objects.types.NetworkServer;
import de.kuschku.libquassel.primitives.types.QVariant; import de.kuschku.libquassel.primitives.types.QVariant;
import de.kuschku.libquassel.syncables.types.IrcChannel;
import de.kuschku.libquassel.syncables.types.IrcUser;
import de.kuschku.libquassel.syncables.types.Network; import de.kuschku.libquassel.syncables.types.Network;
public class NetworkSerializer implements ObjectSerializer<Network> { public class NetworkSerializer implements ObjectSerializer<Network> {
......
package de.kuschku.libquassel.syncables.types; package de.kuschku.libquassel.syncables.types;
import android.util.Log;
import com.google.common.collect.Lists;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import java.util.Arrays;
import java.util.List; import java.util.List;
import de.kuschku.libquassel.BusProvider; import de.kuschku.libquassel.BusProvider;
import de.kuschku.libquassel.Client; import de.kuschku.libquassel.Client;
import de.kuschku.libquassel.functions.types.InitDataFunction; import de.kuschku.libquassel.functions.types.InitDataFunction;
import de.kuschku.libquassel.syncables.types.SyncableObject;
import de.kuschku.util.Stream;
public class IrcUser extends SyncableObject { public class IrcUser extends SyncableObject {
public String server; public String server;
......
...@@ -27,13 +27,13 @@ public abstract class SyncableObject { ...@@ -27,13 +27,13 @@ public abstract class SyncableObject {
return objectName; return objectName;
} }
public void renameObject(String objectName) {
setObjectName(objectName);
}
public void setObjectName(String objectName) { public void setObjectName(String objectName) {
this.objectName = objectName; this.objectName = objectName;
} }
public void renameObject(String objectName) {
setObjectName(objectName);
}
public abstract void init(InitDataFunction function, BusProvider provider, Client client); public abstract void init(InitDataFunction function, BusProvider provider, Client client);
} }
package de.kuschku.quasseldroid_ng; package de.kuschku.quasseldroid_ng;
public class BufferViewManagerChangedEvent { public class BufferViewManagerChangedEvent {
public enum Action {
ADD,
REMOVE,
MODIFY
}
public final int id; public final int id;
public final Action action; public final Action action;
public BufferViewManagerChangedEvent(int id, Action action) { public BufferViewManagerChangedEvent(int id, Action action) {
this.id = id; this.id = id;
this.action = action; this.action = action;
} }
public enum Action {
ADD,
REMOVE,
MODIFY
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment