X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fgenerator%2FGeneratorHelper.java;h=292d8816f28302da3c84649ac9c2d984f21a2547;hb=0e1d117bd715b22bbaacc3aefb4acfd3f77232ee;hp=0e55112219e7a6583d72cfeb5f6f211fd6eb760f;hpb=e44404fac09c8da04b5ef7874160cb91f8fc98a9;p=mir.git

diff --git a/source/mir/generator/GeneratorHelper.java b/source/mir/generator/GeneratorHelper.java
index 0e551122..292d8816 100755
--- a/source/mir/generator/GeneratorHelper.java
+++ b/source/mir/generator/GeneratorHelper.java
@@ -30,18 +30,14 @@
 
 package mir.generator;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import mir.bundle.Bundle;
-import mir.entity.adapter.EntityIteratorAdapter;
-import mir.util.CachingRewindableIterator;
+import mir.entity.adapter.EntityAdapterEngine;
+import mir.entity.adapter.EntityAdapterModel;
 import mir.util.generator.BundleGeneratorFunction;
 import mircoders.global.MirGlobal;
 
+import java.util.*;
+
 
 
 public class GeneratorHelper {
@@ -54,13 +50,15 @@ public class GeneratorHelper {
       Map result = new HashMap();
       MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(result);
 
-      Object languages = new CachingRewindableIterator(new EntityIteratorAdapter("", "id", 30, MirGlobal.localizer().dataModel().adapterModel(), "language"));
+      EntityAdapterModel model = MirGlobal.localizer().dataModel().adapterModel();
+
+      List languages = EntityAdapterEngine.retrieveAdapterList(model, "language", "", "id", -1, 0);
 
-      Object topics = new CachingRewindableIterator(new EntityIteratorAdapter("", "id", 30, MirGlobal.localizer().dataModel().adapterModel(), "topic"));
+      List topics = EntityAdapterEngine.retrieveAdapterList(model, "topic", "", "id", -1, 0);
 
-      Object articleTypes = new CachingRewindableIterator(new EntityIteratorAdapter("", "id", 30, MirGlobal.localizer().dataModel().adapterModel(), "articleType"));
+      List articleTypes  = EntityAdapterEngine.retrieveAdapterList(model, "articleType", "", "id", -1, 0);
 
-      Object commentStatuses = new CachingRewindableIterator(new EntityIteratorAdapter("", "id", 30, MirGlobal.localizer().dataModel().adapterModel(), "commentStatus"));
+      List commentStatuses  = EntityAdapterEngine.retrieveAdapterList(model, "commentStatus", "", "id", -1, 0);
 
       result.put("commentstatuses", commentStatuses);
       result.put("articletypes", articleTypes);