cleanup / abuse system fix / prepping for a release

[mir.git] / source / mircoders / localizer / basic / MirBasicDataModelLocalizer.java

diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
index 54d914e..e015391 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
@@ -29,19 +29,9 @@
  */
 package mircoders.localizer.basic;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
-import mir.entity.adapter.EntityAdapter;
-import mir.entity.adapter.EntityAdapterDefinition;
-import mir.entity.adapter.EntityAdapterModel;
-import mir.entity.adapter.ToManyRelationField;
-import mir.entity.adapter.ToOneRelationField;
+import mir.entity.adapter.*;
 import mir.generator.Generator;
 import mir.generator.GeneratorExc;
 import mir.generator.GeneratorFailure;
@@ -50,7 +40,6 @@ import mir.media.MediaHandler;
 import mir.misc.NumberUtils;
 import mir.util.JDBCStringRoutines;
 import mir.util.ParameterExpander;
-import mir.util.RewindableIterator;
 import mir.util.StructuredContentParser;
 import mircoders.entity.EntityUploadedMedia;
 import mircoders.global.MirGlobal;
@@ -61,29 +50,11 @@ import mircoders.localizer.MirLocalizerFailure;
 import mircoders.media.MediaHelper;
 import mircoders.module.ModuleContent;
 import mircoders.module.ModuleLanguage;
-import mircoders.storage.DatabaseArticleType;
-import mircoders.storage.DatabaseAudio;
-import mircoders.storage.DatabaseBreaking;
-import mircoders.storage.DatabaseComment;
-import mircoders.storage.DatabaseCommentStatus;
-import mircoders.storage.DatabaseContent;
-import mircoders.storage.DatabaseContentToMedia;
-import mircoders.storage.DatabaseContentToTopics;
-import mircoders.storage.DatabaseFilter;
-import mircoders.storage.DatabaseFilterGroup;
-import mircoders.storage.DatabaseImageType;
-import mircoders.storage.DatabaseImages;
-import mircoders.storage.DatabaseLanguage;
-import mircoders.storage.DatabaseMediaType;
-import mircoders.storage.DatabaseMediafolder;
-import mircoders.storage.DatabaseMessages;
-import mircoders.storage.DatabaseOther;
-import mircoders.storage.DatabaseTopics;
-import mircoders.storage.DatabaseUploadedMedia;
-import mircoders.storage.DatabaseUsers;
-import mircoders.storage.DatabaseVideo;
+import mircoders.storage.*;
 import multex.Failure;
 
+import java.util.*;
+
 public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
   protected LoggerWrapper logger = new LoggerWrapper("Localizer.DataModel");
   protected MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();
@@ -623,15 +594,14 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     public Object getValue(EntityAdapter anEntityAdapter) {
       EntityAdapter media;
       Entity mediaType;
-      RewindableIterator iterator;
+      Iterator iterator;
       Map result;
       MediaHandler mediaHandler;
       String tinyIcon;
       String iconAlt;
 
       try {
-        iterator = (RewindableIterator) (anEntityAdapter.get("to_uploaded_media"));
-        iterator.rewind();
+        iterator = anEntityAdapter.getIterator("to_uploaded_media");
 
         tinyIcon = MirGlobal.config().getString("Producer.Icon.TinyText");
         iconAlt = "Text";