Changeset 1198

Timestamp:

02/07/10 11:08:58 (7 months ago)

Author:

dreisch

Message:

-fixed #1040

Location:

ide/trunk/src/org/korsakow/domain

Files:

• command/ExportFlashProjectCommand.java (modified) (7 diffs)
• mapper/input/MapperHelper.java (modified) (2 diffs)
• mapper/input/MediaInputMapper.java (modified) (3 diffs)

ide/trunk/src/org/korsakow/domain/command/ExportFlashProjectCommand.java

@@ -15 +15 @@
 import org.korsakow.domain.interf.IMedia;
 import org.korsakow.domain.interf.IProject;
-import org.korsakow.domain.interf.IResource;
 import org.korsakow.domain.interf.ISettings;
 import org.korsakow.domain.interf.ISound;
 import org.korsakow.domain.interf.IText;
 import org.korsakow.domain.interf.IVideo;
-import org.korsakow.domain.mapper.input.MapperHelper;
+import org.korsakow.domain.mapper.input.MediaInputMapper;
 import org.korsakow.domain.mapper.input.ProjectInputMapper;
 import org.korsakow.domain.task.ITask;
 import org.korsakow.domain.task.IWorker;
-import org.korsakow.ide.DataRegistry;
 import org.korsakow.ide.lang.LanguageBundle;
 import org.korsakow.ide.task.AbstractTask;
 import org.korsakow.ide.task.UIWorker;
-import org.korsakow.ide.util.DomUtil;
 
 
@@ -70 +67 @@
         private static class SetupExporterTask extends AbstractTask
         {
-                private IWorker uiWorker;
-                private File exportDir;
-                private Exporter exporter;
-                private long projectId;
+                private final IWorker uiWorker;
+                private final File exportDir;
+                private final Exporter exporter;
+                private final long projectId;
                 public SetupExporterTask(IWorker uiWorker, Exporter exporter, File exportDir, long projectId)
                 {
@@ -82 +79 @@
                 }
 
+                @Override
                 public void runTask() throws Exception {
                         UoW.newCurrent();
@@ -88 +86 @@
                         ISettings settings = project.getSettings();
 
-                        Collection<IMedia> media = project.getMedia();
+                        Collection<IMedia> media =  MediaInputMapper.findReferencedMedia();
                         Collection<ISound> sounds = new HashSet<ISound>();
                         Collection<IVideo> videos = new HashSet<IVideo>();
@@ -98 +96 @@
                         for (IMedia medium : media)
                         {
-                                System.gc(); // findResourcesReferencing can be a large task on big projects
-                                
                                 fireProgressChanged(0, ++i*100/size);
                                 fireDisplayStringChanged("", medium.getName());
-//                              Thread.sleep(70); // this is a completely unreliable way of giving the publish a chance to run
-//                              // don't export unused media since it takes long and uses up space, which especially is important for web.
-                                Collection<IResource> referers = MapperHelper.findResourcesReferencing(medium.getId());
-                                if (referers.isEmpty())
-                                        continue;
                                 
                                 if (medium instanceof ISound)
@@ -123 +114 @@
                         }
                         long after = System.currentTimeMillis();
-//                      System.out.println("Determination: " + (after-before)/1000);
+                        System.out.println("Determination: " + (after-before)/1000 + "\t" + media.size());
                         
                         
@@ -139 +130 @@
                         uiWorker.addTasks(exportTasks);
                 }
+                @Override
                 public String getTitleString()
                 {

ide/trunk/src/org/korsakow/domain/mapper/input/MapperHelper.java

@@ -28 +28 @@
 public class MapperHelper
 {
+        public static final String[] REFERENCING_ELEMENTS = {
+                                                        "backgroundSoundId",
+                                                        "backgroundImageId",
+                                                        "clickSoundId",
+                                                        "splashScreenMediaId",
+                                                        "soundId",
+                                                        "textId",
+                                                        "imageId",
+                                                        "mainMediaId",
+                                                        "videoId",
+                                                        "snuId",
+                                                        "mediaId",
+                                                        "startingSnuId",
+                                                        "interfaceId",
+                                                        "previewMediaId"
+        };
         /**
          * This is a terrible implementation.
@@ -98 +114 @@
                 Set<IResource> references = new HashSet<IResource>();
                 
-                String[] REFERENCING_ELEMENTS = {
-                                                                "backgroundSoundId",
-                                                                "backgroundImageId",
-                                                                "clickSoundId",
-                                                                "splashScreenMediaId",
-                                                                "soundId",
-                                                                "textId",
-                                                                "imageId",
-                                                                "mainMediaId",
-                                                                "videoId",
-                                                                "snuId",
-                                                                "mediaId",
-                                                                "startingSnuId",
-                                                                "interfaceId",
-                                                                "previewMediaId"
-                };
-//              // TODO: obviously maintaining this list is not the way to go
+                //              // TODO: obviously maintaining this list is not the way to go
 //              // I would like to have it so the structure clearly differentiates between an ID declaration and
 //              // a reference to an object's id

ide/trunk/src/org/korsakow/domain/mapper/input/MediaInputMapper.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.xml.xpath.XPathExpressionException;
@@ -13 +15 @@
 import org.korsakow.domain.interf.IMedia;
 import org.korsakow.domain.interf.IResource;
+import org.korsakow.ide.DataRegistry;
 import org.korsakow.services.finder.ResourceFinder;
 import org.w3c.dom.Element;
@@ -57 +60 @@
                 }
         }
+        public static Collection<IMedia> findReferencedMedia() throws MapperException, DomainObjectCreationException, XPathExpressionException, SQLException
+        {
+                Set<IMedia> referenced = new HashSet<IMedia>();
+                
+//              // TODO: obviously maintaining this list is not the way to go
+//              // I would like to have it so the structure clearly differentiates between an ID declaration and
+//              // a reference to an object's id
+//              // something along the lines of <Snu><mainMedia><refId>1</refId></mainMedia></Snu>
+                for (String ELEMENT : MapperHelper.REFERENCING_ELEMENTS)
+                {
+                        NodeList elements = DataRegistry.getDocument().getElementsByTagName(ELEMENT);
+                        int length = elements.getLength();
+                        for (int i = 0; i < length; ++i) {
+                                Element element = (Element)elements.item(i);
+                                long refId = Long.parseLong(element.getTextContent());
+                                IResource resource = ResourceInputMapper.map(refId);
+                                if (resource instanceof IMedia)
+                                        referenced.add((IMedia)resource);
+                        }
+                }
+                return referenced;
+        }
 }