Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: jni/JniFilter.cpp

Issue 6606493159784448: New JNI bindings (Closed)
Left Patch Set: Style review fixes Created March 28, 2014, 11 a.m.
Right Patch Set: Removed TODO from AppInfo. Created April 11, 2014, 1:28 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « jni/JniEventCallback.cpp ('k') | jni/JniFilterChangeCallback.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <AdblockPlus.h> 18 #include <AdblockPlus.h>
19 #include "Utils.h" 19 #include "Utils.h"
20 #include "JniJsValue.h" 20 #include "JniJsValue.h"
21 21
22 static AdblockPlus::Filter* GetFilterPtr(jlong ptr) 22 static AdblockPlus::Filter* GetFilterPtr(jlong ptr)
23 { 23 {
24 return JniLongToTypePtr<AdblockPlus::FilterPtr>(ptr)->get(); 24 return JniLongToTypePtr<AdblockPlus::FilterPtr>(ptr)->get();
25 } 25 }
26 26
27 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jsValue) 27 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jsValue)
28 { 28 {
29 TRY 29 try
30 { 30 {
31 return JniPtrToLong(new AdblockPlus::FilterPtr(new AdblockPlus::Filter(JniGe tJsValuePtr(jsValue)))); 31 return JniPtrToLong(new AdblockPlus::FilterPtr(new AdblockPlus::Filter(JniGe tJsValuePtr(jsValue))));
32 } 32 }
33 CATCH_THROW_AND_RETURN(env, 0) 33 CATCH_THROW_AND_RETURN(env, 0)
34 } 34 }
35 35
36 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr) 36 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr)
37 { 37 {
38 AdblockPlus::Filter::Type type; 38 AdblockPlus::Filter::Type type;
39 TRY 39 try
40 { 40 {
41 type = GetFilterPtr(ptr)->GetType(); 41 type = GetFilterPtr(ptr)->GetType();
42 } 42 }
43 CATCH_THROW_AND_RETURN(env, 0) 43 CATCH_THROW_AND_RETURN(env, 0)
44 44
45 const char* enumName = 0; 45 const char* enumName = 0;
46 46
47 switch (type) 47 switch (type)
48 { 48 {
49 case AdblockPlus::Filter::TYPE_BLOCKING: 49 case AdblockPlus::Filter::TYPE_BLOCKING:
(...skipping 16 matching lines...) Expand all
66 break; 66 break;
67 } 67 }
68 68
69 jclass enumClass = env->FindClass(PKG("Filter$Type")); 69 jclass enumClass = env->FindClass(PKG("Filter$Type"));
70 jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("Filter$Ty pe")); 70 jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("Filter$Ty pe"));
71 return env->GetStaticObjectField(enumClass, enumField); 71 return env->GetStaticObjectField(enumClass, enumField);
72 } 72 }
73 73
74 static jboolean JNICALL JniIsListed(JNIEnv* env, jclass clazz, jlong ptr) 74 static jboolean JNICALL JniIsListed(JNIEnv* env, jclass clazz, jlong ptr)
75 { 75 {
76 TRY 76 try
77 { 77 {
78 return GetFilterPtr(ptr)->IsListed() ? JNI_TRUE : JNI_FALSE; 78 return GetFilterPtr(ptr)->IsListed() ? JNI_TRUE : JNI_FALSE;
79 } 79 }
80 CATCH_THROW_AND_RETURN(env, JNI_FALSE) 80 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
81 } 81 }
82 82
83 static void JNICALL JniAddToList(JNIEnv* env, jclass clazz, jlong ptr) 83 static void JNICALL JniAddToList(JNIEnv* env, jclass clazz, jlong ptr)
84 { 84 {
85 TRY 85 try
86 { 86 {
87 GetFilterPtr(ptr)->AddToList(); 87 GetFilterPtr(ptr)->AddToList();
88 } 88 }
89 CATCH_AND_THROW(env) 89 CATCH_AND_THROW(env)
90 } 90 }
91 91
92 static void JNICALL JniRemoveFromList(JNIEnv* env, jclass clazz, jlong ptr) 92 static void JNICALL JniRemoveFromList(JNIEnv* env, jclass clazz, jlong ptr)
93 { 93 {
94 TRY 94 try
95 { 95 {
96 GetFilterPtr(ptr)->RemoveFromList(); 96 GetFilterPtr(ptr)->RemoveFromList();
97 } 97 }
98 CATCH_AND_THROW(env) 98 CATCH_AND_THROW(env)
99 } 99 }
100 100
101 static jboolean JNICALL JniOperatorEquals(JNIEnv* env, jclass clazz, jlong ptr, jlong otherPtr) 101 static jboolean JNICALL JniOperatorEquals(JNIEnv* env, jclass clazz, jlong ptr, jlong otherPtr)
102 { 102 {
103 AdblockPlus::Filter* me = GetFilterPtr(ptr); 103 AdblockPlus::Filter* me = GetFilterPtr(ptr);
104 AdblockPlus::Filter* other = GetFilterPtr(otherPtr); 104 AdblockPlus::Filter* other = GetFilterPtr(otherPtr);
105 105
106 TRY 106 try
107 { 107 {
108 return *me == *other ? JNI_TRUE : JNI_FALSE; 108 return *me == *other ? JNI_TRUE : JNI_FALSE;
109 } 109 }
110 CATCH_THROW_AND_RETURN(env, JNI_FALSE) 110 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
111 } 111 }
112 112
113 static JNINativeMethod methods[] = 113 static JNINativeMethod methods[] =
114 { 114 {
115 { (char*)"ctor", (char*)"(J)J", (void*)JniCtor }, 115 { (char*)"ctor", (char*)"(J)J", (void*)JniCtor },
116 { (char*)"getType", (char*)"(J)" TYP("Filter$Type"), (void*)JniGetType }, 116 { (char*)"getType", (char*)"(J)" TYP("Filter$Type"), (void*)JniGetType },
117 { (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed }, 117 { (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed },
118 { (char*)"addToList", (char*)"(J)V", (void*)JniAddToList }, 118 { (char*)"addToList", (char*)"(J)V", (void*)JniAddToList },
119 { (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList }, 119 { (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList },
120 { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals } 120 { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals }
121 }; 121 };
122 122
123 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_Filter_regist erNatives(JNIEnv *env, jclass clazz) 123 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Filter_reg isterNatives(JNIEnv *env, jclass clazz)
124 { 124 {
125 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 125 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
126 } 126 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld