Changeset 78 for trunk/src/org/expeditee/items/ItemUtils.java

Timestamp:

05/26/08 09:11:05 (16 years ago)

Author:

ra33

Message:

Added @b and @v...
Also changed @f... so that images can be displayed with transparent backgrounds.
Did a bunch of refactoring in the process to remove duplicated code and simplify managing @i, @f and @b.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/expeditee/items/ItemUtils.java (modified) (12 diffs)

trunk

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

trunk/src/org/expeditee/items/ItemUtils.java

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -71 +70 @@
 
         public static final int TAG_STAT_TEMPLATE = 18;
+        
+        public static final int TAG_VECTOR = 19;
+        
+        public static final int TAG_BITMAP_IMAGE = 20;
 
         public static final int TAG_MIN = 0;
 
-        public static final int TAG_MAX = 18;
+        public static final int TAG_MAX = 20;
 
         /**
@@ -115 +118 @@
          *         is found
          */
-        public static Text FindTag(List<Item> items, int tag) {
+        public static Item FindTag(List<Item> items, int tag) {
                 return FindTag(items, GetTag(tag));
         }
@@ -139 +142 @@
         }
 
-        public static Text FindExactTag(List<Item> items, String toFind) {
+        public static Item FindExactTag(List<Item> items, String toFind) {
                 for (Item i : items) {
                         if (i instanceof Text && i.isAnnotation())
                                 if (((Text) i).getTextNoList().trim().equalsIgnoreCase(toFind))
-                                        return (Text) i;
+                                        return (Item) i;
                 }
 
@@ -149 +152 @@
         }
 
-        public static Text FindExactTag(List<Item> items, int tag) {
+        public static Item FindExactTag(List<Item> items, int tag) {
                 return FindExactTag(items, GetTag(tag));
         }
@@ -285 +288 @@
                 case TAG_OVERLAY:
                         return "@o";
+                case TAG_VECTOR:
+                        return "@v";
                 case TAG_ACTIVE_OVERLAY:
                         return "@ao";
@@ -307 +312 @@
                 case TAG_FRAME_IMAGE:
                         return "@f";
+                case TAG_BITMAP_IMAGE:
+                        return "@b";
                 case TAG_BACKUP:
                         return "@old";
@@ -418 +425 @@
         }
 
-        public static Picture CreateFramePicture(Text source, ImageObserver observer) {
+        public static Picture CreateFrameImage(Text source, ImageObserver observer) {
                 String size = source.getFirstLine();
 
@@ -426 +433 @@
 
                 try {
-                        Picture pic = new Picture(source, null, size, observer);
+                        Picture pic = new FrameImage(source, size, observer);
                         return pic;
                 } catch (Exception e) {
@@ -433 +440 @@
                 }
         }
+        
+        public static Picture CreateFrameBitmap(Text source, ImageObserver observer) {
+                String size = source.getFirstLine();
+
+                // remove @b tag
+                size = size.replaceFirst("@b", "");
+                size = size.trim();
+
+                try {
+                        Picture pic = new FrameBitmap(source, size, observer);
+                        return pic;
+                } catch (Exception e) {
+                        // e.printStackTrace();
+                        return null;
+                }
+        }
 
         /**
@@ -450 +473 @@
 
                 // list of dots at the end of lines
-                Collection<Item> lineEnds = new HashSet<Item>();
-                Collection<Line> lines = new HashSet<Line>();
-                Collection<Constraint> constraints = new HashSet<Constraint>();
-
-                Collection<Item> singles = new HashSet<Item>();
+                Collection<Item> lineEnds = new LinkedHashSet<Item>();
+                Collection<Line> lines = new LinkedHashSet<Line>();
+                Collection<Constraint> constraints = new LinkedHashSet<Constraint>();
+
+                Collection<Item> singles = new LinkedHashSet<Item>();
 
                 Map<Item, Item> lineEndMap = new HashMap<Item, Item>();
@@ -529 +552 @@
                 for (Line line : lines) {
                         Line lineCopy = line.copy();
-                        lineCopy.setEndItem(lineEndMap.get(line.getEndItem()));
-                        lineCopy.setStartItem(lineEndMap.get(line.getStartItem()));
+                        //get the lineEnd we copied above if it is in the MAPPING
+                        Item originalLineEnd = line.getEndItem();
+                        Item actualLineEnd = lineEndMap.get(originalLineEnd);
+                        if (actualLineEnd == null)
+                                lineCopy.setEndItem(originalLineEnd);
+                        else
+                                lineCopy.setEndItem(actualLineEnd);
+                        
+                        Item originalLineStart = line.getStartItem();
+                        Item actualLineStart = lineEndMap.get(originalLineStart);
+                        if (actualLineStart == null)
+                                lineCopy.setStartItem(originalLineStart);
+                        else
+                                lineCopy.setStartItem(actualLineStart);
+                        
                         copies.add(lineCopy);
                 }

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt