diff --git a/.idea/artifacts/kelp_additional_kernels_jar.xml b/.idea/artifacts/kelp_additional_kernels_jar.xml
new file mode 100644
index 0000000..15358da
--- /dev/null
+++ b/.idea/artifacts/kelp_additional_kernels_jar.xml
@@ -0,0 +1,9 @@
+
+
+ $PROJECT_DIR$/../jars/
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100644
index 0000000..a6944f6
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml
new file mode 100644
index 0000000..cc9065d
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_4.xml
new file mode 100644
index 0000000..fdba752
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_4.xml
new file mode 100644
index 0000000..b74b06d
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 0000000..0e66824
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml b/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml
new file mode 100644
index 0000000..01a573a
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_efficient_java_matrix_library_ejml_0_24.xml b/.idea/libraries/Maven__com_googlecode_efficient_java_matrix_library_ejml_0_24.xml
new file mode 100644
index 0000000..c953dde
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_efficient_java_matrix_library_ejml_0_24.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
new file mode 100644
index 0000000..14681ee
--- /dev/null
+++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__it_uniroma2_sag_kelp_kelp_core_2_0_1.xml b/.idea/libraries/Maven__it_uniroma2_sag_kelp_kelp_core_2_0_1.xml
new file mode 100644
index 0000000..4ae2992
--- /dev/null
+++ b/.idea/libraries/Maven__it_uniroma2_sag_kelp_kelp_core_2_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml
new file mode 100644
index 0000000..f33320d
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_trove4j_trove4j_3_0_3.xml b/.idea/libraries/Maven__net_sf_trove4j_trove4j_3_0_3.xml
new file mode 100644
index 0000000..72d4d7e
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_trove4j_trove4j_3_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
new file mode 100644
index 0000000..78cfcd3
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.xml
new file mode 100644
index 0000000..7b4e548
--- /dev/null
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_9_RC1.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_9_RC1.xml
new file mode 100644
index 0000000..95dd64a
--- /dev/null
+++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_9_RC1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
new file mode 100644
index 0000000..1e67260
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_7.xml
new file mode 100644
index 0000000..7f7a926
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
new file mode 100644
index 0000000..c36e717
--- /dev/null
+++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2ffd0d1..73ae0f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
it.uniroma2.sag.kelp
kelp-additional-kernels
@@ -86,6 +86,26 @@
kelp-core
2.0.1
+
+ org.apache.commons
+ commons-lang3
+ 3.4
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.7
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.7
+
+
+ org.reflections
+ reflections
+ 0.9.9-RC1
+
diff --git a/src/main/java/it/uniroma2/sag/kelp/data/representation/structure/similarity/StructureElementSimilarityTypeResolver.java b/src/main/java/it/uniroma2/sag/kelp/data/representation/structure/similarity/StructureElementSimilarityTypeResolver.java
index 94a4deb..94f2137 100644
--- a/src/main/java/it/uniroma2/sag/kelp/data/representation/structure/similarity/StructureElementSimilarityTypeResolver.java
+++ b/src/main/java/it/uniroma2/sag/kelp/data/representation/structure/similarity/StructureElementSimilarityTypeResolver.java
@@ -15,21 +15,22 @@
package it.uniroma2.sag.kelp.data.representation.structure.similarity;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.reflections.Reflections;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.databind.DatabindContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.reflections.Reflections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
/**
* It is a class implementing TypeIdResolver which will be used by
* Jackson library during the serialization in JSON and deserialization of
@@ -103,6 +104,10 @@ public JavaType typeFromId(String arg0) {
+ "'");
}
+ public JavaType typeFromId(DatabindContext var1, String arg0) {
+ return typeFromId(arg0);
+ }
+
public String idFromValueAndType(Object arg0, Class arg1) {
return classToIdMapping.get(arg0.getClass());
}