Changeset 838 for trunk/src/org/expeditee/items

Timestamp:

02/05/14 11:15:35 (10 years ago)

Author:

jts21

Message:

Implement automatically downloading images from FrameShare servers. Also includes code for uploading images, but that's not ready yet.

File:

• trunk/src/org/expeditee/items/ItemUtils.java (modified) (4 diffs)

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

@@ -26 +26 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.network.FrameShare;
 import org.expeditee.settings.folders.FolderSettings;
 
@@ -344 +345 @@
          *         not found.
          */
-        public static Picture CreatePicture(Text source, ImageObserver observer) {
+        public static Picture CreatePicture(Text source, ImageObserver observer, boolean tryRemote) {
                 String text = source.getText();
                 String path = "";
@@ -398 +399 @@
                                 path = file.getPath();
 
-                        // if the image isn't found by now, give up.
+                        // if the image isn't found by now, try remote servers
                         file = new File(path);
                         if (!file.exists() || file.isDirectory()) {
+                        if(tryRemote && FrameShare.getInstance().loadImage(fileName, null)) {
+                                // call CreatePicture again, but with tryRemote set to false so we won't get into an infinite loop
+                                // if something goes wrong with finding the downloaded image
+                                return CreatePicture(source, observer, false);
+                        }
                                 return null;
                         }
@@ -417 +423 @@
                 }
 
+        }
+        
+        public static Picture CreatePicture(Text source, ImageObserver observer) {
+                return CreatePicture(source, observer, true);
         }