From 4e68c11ab3ef8d7ce91f09785dfc2d15bbe37938 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Laferri=C3=A8re?= <alexis.laf@xymus.net>
Date: Mon, 26 Jan 2015 11:10:31 -0500
Subject: [PATCH] contrib/jwrapper: remove even more code related to
 collection hack
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---
 contrib/jwrapper/src/code_generator.nit |   28 ----------------------------
 contrib/jwrapper/src/model.nit          |    5 -----
 2 files changed, 33 deletions(-)

diff --git a/contrib/jwrapper/src/code_generator.nit b/contrib/jwrapper/src/code_generator.nit
index 860b98a..965339f 100644
--- a/contrib/jwrapper/src/code_generator.nit
+++ b/contrib/jwrapper/src/code_generator.nit
@@ -27,7 +27,6 @@ class CodeGenerator
 	var java_class: JavaClass
 	var nb_params: Int
 	var module_name: String
-	fun code_warehouse: CodeWarehouse do return once new CodeWarehouse
 
 	init (file_name: String, jclass: JavaClass, with_attributes, comment: Bool)
 	do
@@ -229,33 +228,6 @@ class CodeGenerator
 	end
 end
 
-# Contains raw code mostly used to copy collections
-class CodeWarehouse
-
-	private fun create_imports(nit_type: NitType, is_param: Bool): String
-	do
-		var imports = ""
-		var ntype = nit_type.to_s
-		var gen_type = nit_type.generic_params.join(", ")
-
-		if not is_param then
-			if nit_type.is_map then
-				imports = """ import {{{ntype}}}, {{{ntype}}}.[]="""
-			else
-				imports = """ import {{{ntype}}}, {{{ntype}}}.add"""
-			end
-		else if nit_type.id == "Array" then
-			imports = """ import {{{ntype}}}, {{{ntype}}}.length, {{{ntype}}}.[]"""
-		else if nit_type.is_map then
-			imports = """ import {{{ntype}}}.iterator, Iterator[{{{gen_type}}}].is_ok, Iterator[{{{gen_type}}}].next, Iterator[{{{gen_type}}}].item, Iterator[{{{gen_type}}}].key"""
-		else
-			imports = """ import {{{ntype}}}.iterator, Iterator[{{{gen_type}}}].is_ok, Iterator[{{{gen_type}}}].next, Iterator[{{{gen_type}}}].item"""
-		end
-
-		return imports
-	end
-end
-
 redef class String
 	# Convert the Java method name `self` to the Nit style
 	#
diff --git a/contrib/jwrapper/src/model.nit b/contrib/jwrapper/src/model.nit
index b77c734..cb99a23 100644
--- a/contrib/jwrapper/src/model.nit
+++ b/contrib/jwrapper/src/model.nit
@@ -85,8 +85,6 @@ class JavaType
 
 	fun is_collection: Bool do return is_primitive_array or collections_list.has(self.id)
 
-	fun is_map: Bool do return maps.has(self.id)
-
 	fun is_wrapped: Bool do return find_extern_class != null
 
 	fun extern_name: NitType
@@ -249,7 +247,6 @@ class NitType
 	var is_complete: Bool = true
 
 	fun has_generic_params: Bool do return not generic_params == null
-	fun maps: Array[String] is cached do return ["HashMap", "RBTreeMap"]
 
 	fun id: String do return identifier
 
@@ -271,8 +268,6 @@ class NitType
 		self.mod = mod
 	end
 
-	fun is_map: Bool do return maps.has(self.identifier)
-
 	redef fun to_s: String
 	do
 		var id = self.identifier
-- 
1.7.9.5