Skip to content

Commit

Permalink
No more char_vector type
Browse files Browse the repository at this point in the history
  • Loading branch information
aldenml committed Feb 4, 2016
1 parent b455c1f commit a044097
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 875 deletions.
62 changes: 4 additions & 58 deletions src/main/java/com/frostwire/jlibtorrent/Vectors.java
@@ -1,6 +1,9 @@
package com.frostwire.jlibtorrent;

import com.frostwire.jlibtorrent.swig.*;
import com.frostwire.jlibtorrent.swig.byte_vector;
import com.frostwire.jlibtorrent.swig.int64_vector;
import com.frostwire.jlibtorrent.swig.int_vector;
import com.frostwire.jlibtorrent.swig.unsigned_char_vector;

/**
* @author gubatron
Expand All @@ -11,17 +14,6 @@ public final class Vectors {
private Vectors() {
}

public static byte[] char_vector2bytes(char_vector v) {
int size = (int) v.size();
byte[] arr = new byte[size];

for (int i = 0; i < size; i++) {
arr[i] = (byte) v.get(i);
}

return arr;
}

public static byte[] byte_vector2bytes(byte_vector v) {
int size = (int) v.size();
byte[] arr = new byte[size];
Expand All @@ -41,34 +33,6 @@ public static void byte_vector2bytes(byte_vector v, byte[] arr) {
}
}

public static void char_vector2bytes(char_vector v, byte[] arr) {
int size = (int) v.size();

for (int i = 0; i < size; i++) {
arr[i] = (byte) v.get(i);
}
}

public static char_vector string2char_vector(String s) {
char_vector v = new char_vector();

for (int i = 0; i < s.length(); i++) {
v.add(s.charAt(i));
}

return v;
}

public static char_vector bytes2char_vector(byte[] arr) {
char_vector v = new char_vector();

for (int i = 0; i < arr.length; i++) {
v.add((char) arr[i]);
}

return v;
}

public static byte_vector bytes2byte_vector(byte[] arr) {
byte_vector v = new byte_vector();

Expand Down Expand Up @@ -111,24 +75,6 @@ public static long[] int64_vector2longs(int64_vector v) {
return arr;
}

public static unsigned_char_vector new_unsigned_char_vector(int size) {
unsigned_char_vector v = new unsigned_char_vector();
for (int i = 0; i < size; i++) {
v.add((short) 0);
}

return v;
}

public static char_vector new_char_vector(int size) {
char_vector v = new char_vector();
for (int i = 0; i < size; i++) {
v.add((char) 0);
}

return v;
}

public static byte_vector new_byte_vector(int size) {
byte_vector v = new byte_vector();
byte z = (byte) 0;
Expand Down
74 changes: 0 additions & 74 deletions src/main/java/com/frostwire/jlibtorrent/swig/char_vector.java

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
Expand Up @@ -77,16 +77,6 @@ public class libtorrent_jni {
public final static native String string_vector_get(long jarg1, string_vector jarg1_, int jarg2);
public final static native void string_vector_set(long jarg1, string_vector jarg1_, int jarg2, String jarg3);
public final static native void delete_string_vector(long jarg1);
public final static native long new_char_vector();
public final static native long char_vector_size(long jarg1, char_vector jarg1_);
public final static native long char_vector_capacity(long jarg1, char_vector jarg1_);
public final static native void char_vector_reserve(long jarg1, char_vector jarg1_, long jarg2);
public final static native boolean char_vector_isEmpty(long jarg1, char_vector jarg1_);
public final static native void char_vector_clear(long jarg1, char_vector jarg1_);
public final static native void char_vector_add(long jarg1, char_vector jarg1_, char jarg2);
public final static native char char_vector_get(long jarg1, char_vector jarg1_, int jarg2);
public final static native void char_vector_set(long jarg1, char_vector jarg1_, int jarg2, char jarg3);
public final static native void delete_char_vector(long jarg1);
public final static native long new_string_int_pair_vector();
public final static native long string_int_pair_vector_size(long jarg1, string_int_pair_vector jarg1_);
public final static native long string_int_pair_vector_capacity(long jarg1, string_int_pair_vector jarg1_);
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/frostwire/jlibtorrent/demo/DhtNs.java
Expand Up @@ -3,7 +3,6 @@
import com.frostwire.jlibtorrent.*;
import com.frostwire.jlibtorrent.alerts.*;
import com.frostwire.jlibtorrent.swig.byte_vector;
import com.frostwire.jlibtorrent.swig.char_vector;
import com.frostwire.jlibtorrent.swig.entry;
import com.frostwire.jlibtorrent.swig.settings_pack;

Expand Down
7 changes: 1 addition & 6 deletions swig/libtorrent.i
Expand Up @@ -81,11 +81,9 @@
#include "libtorrent/extensions/lt_trackers.hpp"
#include "libtorrent/extensions/smart_ban.hpp"

// additional includes

using namespace boost;
using namespace boost::system;

using namespace libtorrent;


Expand Down Expand Up @@ -232,7 +230,6 @@ namespace std {

%template(byte_vector) vector<int8_t>;
%template(string_vector) vector<std::string>;
%template(char_vector) vector<char>;
%template(string_int_pair_vector) vector<std::pair<std::string, int>>;
%template(string_string_pair_vector) vector<std::pair<std::string, std::string>>;
%template(int_int_pair_vector) vector<std::pair<int, int>>;
Expand Down Expand Up @@ -271,8 +268,6 @@ namespace std {
%template(string_dht_extension_handler_listener_ptr_pair_vector) vector<std::pair<string, dht_extension_handler_listener*>>;
};

// this are ignore until we solve the specific type issues

%ignore match_filesizes;
%ignore clone;
%ignore new_feed;
Expand Down

0 comments on commit a044097

Please sign in to comment.