Merge pull request #23 from codenameone/master

update

Author: ThomasH99

.gitignore

@@ -23,6 +23,7 @@
 *.jar
 *.class
 **/private/*
+**/.idea/*
 **/build/*
 **/dist/*
 *.zip
@@ -58,4 +59,4 @@ node_modules
 /Ports/CLDC11/build/
 /Ports/CLDC11/dist/
 /Samples/SampleProjectTemplate/nbproject/private/
-/Samples/config
+/Samples/config

CodenameOne/src/com/codename1/components/MediaPlayer.java

@@ -256,7 +256,9 @@ public void run() {
                         float pos = video.getTime();
                         int offset = (int)(pos / dur * 100.0f);
                         if(offset > -1 && offset < 101) {
-                            progress.setProgress(offset);
+                            if (progress != null) {
+                                progress.setProgress(offset);
+                            }
                         }
                     }
                 }
@@ -435,9 +437,11 @@ private void initUI() {
                 public void actionPerformed(ActionEvent evt) {
                     float dur = video.getDuration();
                     if(dur > 0) {
-                        float pos = progress.getProgress();
-                        int t = (int)(pos / 100.0f * dur);
-                        video.setTime(t);
+                        if (progress != null) {
+                            float pos = progress.getProgress();
+                            int t = (int)(pos / 100.0f * dur);
+                            video.setTime(t);
+                        }
                     }
                 }
             });

CodenameOne/src/com/codename1/components/SpanButton.java

@@ -33,6 +33,7 @@
 import com.codename1.ui.layouts.BoxLayout;
 import com.codename1.ui.layouts.FlowLayout;
 import com.codename1.ui.plaf.Style;
+import com.codename1.ui.plaf.UIManager;
 
 /**
  * <p>
@@ -434,17 +435,25 @@ public void setAutoRelease(boolean autoRelease) {
 
     @Override
     protected Dimension calcPreferredSize() {
+        
         int w = getWidth();
         int h = getHeight();
-        Dimension dim = super.calcPreferredSize();
-        setWidth(dim.getWidth());
-        setHeight(dim.getHeight());
-        setShouldCalcPreferredSize(true);
-        
-        dim = super.calcPreferredSize();
+        Dimension d = getLayout().getPreferredSize(this);
+        setWidth(d.getWidth());
+        setHeight(d.getHeight());
+        d = getLayout().getPreferredSize(this);
+        Style style = getStyle();
+        if(style.getBorder() != null && d.getWidth() != 0 && d.getHeight() != 0) {
+            d.setWidth(Math.max(style.getBorder().getMinimumWidth(), d.getWidth()));
+            d.setHeight(Math.max(style.getBorder().getMinimumHeight(), d.getHeight()));
+        }
+        if(UIManager.getInstance().getLookAndFeel().isBackgroundImageDetermineSize() && style.getBgImage() != null) {
+            d.setWidth(Math.max(style.getBgImage().getWidth(), d.getWidth()));
+            d.setHeight(Math.max(style.getBgImage().getHeight(), d.getHeight()));
+        }
         setWidth(w);
         setHeight(h);
-        return dim;
+        return d;
     }
 
 

CodenameOne/src/com/codename1/components/SpanLabel.java

@@ -31,6 +31,7 @@
 import com.codename1.ui.layouts.BoxLayout;
 import com.codename1.ui.layouts.FlowLayout;
 import com.codename1.ui.plaf.Style;
+import com.codename1.ui.plaf.UIManager;
 
 /**
  * <p>A multi line label component that can be easily localized, this is simply based
@@ -416,17 +417,25 @@ public boolean isTextSelectionEnabled() {
 
     @Override
     protected Dimension calcPreferredSize() {
+        
         int w = getWidth();
         int h = getHeight();
-        Dimension dim = super.calcPreferredSize();
-        setWidth(dim.getWidth());
-        setHeight(dim.getHeight());
-        setShouldCalcPreferredSize(true);
-        
-        dim = super.calcPreferredSize();
+        Dimension d = getLayout().getPreferredSize(this);
+        setWidth(d.getWidth());
+        setHeight(d.getHeight());
+        d = getLayout().getPreferredSize(this);
+        Style style = getStyle();
+        if(style.getBorder() != null && d.getWidth() != 0 && d.getHeight() != 0) {
+            d.setWidth(Math.max(style.getBorder().getMinimumWidth(), d.getWidth()));
+            d.setHeight(Math.max(style.getBorder().getMinimumHeight(), d.getHeight()));
+        }
+        if(UIManager.getInstance().getLookAndFeel().isBackgroundImageDetermineSize() && style.getBgImage() != null) {
+            d.setWidth(Math.max(style.getBgImage().getWidth(), d.getWidth()));
+            d.setHeight(Math.max(style.getBgImage().getHeight(), d.getHeight()));
+        }
         setWidth(w);
         setHeight(h);
-        return dim;
+        return d;
     }
 
 

CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java

@@ -376,6 +376,10 @@ public boolean usesInvokeAndBlockForEditString() {
      */
     public abstract void editString(Component cmp, int maxSize, int constraint, String text, int initiatingKeycode);
 
+    public boolean nativeEditorPaintsHint() {
+        return true;
+    }
+    
     /**
      * Returns true if we are currently editing a component
      * @return whether a component is being edited

CodenameOne/src/com/codename1/io/ConnectionRequest.java

@@ -34,6 +34,7 @@
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
 import com.codename1.ui.util.EventDispatcher;
+import com.codename1.util.AsyncResource;
 import com.codename1.util.Base64;
 import com.codename1.util.Callback;
 import com.codename1.util.CallbackAdapter;
@@ -2417,6 +2418,48 @@ public static Map<String, Object> fetchJSON(String url) throws IOException {
         return result;
     }
 
+    /**
+     * Fetches JSON asynchronously.
+     * @param url The URL to fetch.
+     * @return AsyncResource that will resolve with either an exception or the parsed JSON data.
+     * @since 7.0
+     */
+    public static AsyncResource<Map<String, Object>> fetchJSONAsync(String url) {
+        final AsyncResource<Map<String, Object>> out = new AsyncResource<Map<String, Object>>();
+        final ConnectionRequest cr = new ConnectionRequest();
+        cr.setFailSilently(true);
+        cr.setPost(false);
+        cr.setUrl(url);
+        cr.addResponseListener(new ActionListener<NetworkEvent>() {
+            @Override
+            public void actionPerformed(NetworkEvent evt) {
+                if (out.isDone()) {
+                    return;
+                }
+                if(cr.getResponseData() == null) {
+                    if(cr.failureException != null) {
+                        out.error(new IOException(cr.failureException.toString()));
+                        return;
+                    } else {
+                        out.error(new IOException("Server returned error code: " + cr.failureErrorCode));
+                        return;
+                    }
+                }
+                JSONParser jp = new JSONParser();
+                Map<String,Object> result = null;
+                try {
+                    result = jp.parseJSON(new InputStreamReader(new ByteArrayInputStream(cr.getResponseData()), "UTF-8"));
+                } catch (IOException ex) {
+                    out.error(ex);
+                    return;
+                }
+                out.complete(result);
+            }
+        });
+        NetworkManager.getInstance().addToQueue(cr);
+        return out;
+    }
+    
     /**
      * Downloads an image to a specified storage file asynchronously and calls the onSuccessCallback with the resulting image.  
      * If useCache is true, then this will first try to load the image from Storage if it exists.
@@ -2431,6 +2474,44 @@ public void downloadImageToStorage(String storageFile, final SuccessCallback<Ima
         downloadImage(onSuccess, onFail, useCache);
     }
 
+    /**
+     * Downloads an image to a specified storage file asynchronously returning an AsyncResource that resolves to the resulting image.. 
+     * @param storageFile The storage file where the file should be saved.
+     * @return AsyncResource<Image> that will resolve to the loaded image.
+     * @since 7.0
+     */
+    public AsyncResource<Image> downloadImageToStorage(String storageFile) {
+        return downloadImageToStorage(storageFile, true);
+    }
+    
+    /**
+     * Downloads an image to a specified storage file asynchronously returning an AsyncResource that resolves to the resulting image..  
+     * If useCache is true, then this will first try to load the image from Storage if it exists.
+     * @param storageFile The storage file where the file should be saved.
+     * @param useCache If true, then this will first check the storage to see if the image is already downloaded.
+     * @return AsyncResource<Image> that will resolve to the loaded image.
+     * @since 7.0
+     */
+    public AsyncResource<Image> downloadImageToStorage(String storageFile, boolean useCache) {
+        final AsyncResource<Image> out = new AsyncResource<Image>();
+        downloadImageToStorage(storageFile, new SuccessCallback<Image>() {
+            @Override
+            public void onSucess(Image value) {
+                if (!out.isDone()) {
+                    out.complete(value);
+                }
+            }
+        }, new FailureCallback<Image>() {
+            @Override
+            public void onError(Object sender, Throwable err, int errorCode, String errorMessage) {
+                if (!out.isDone()) {
+                    out.error(err);
+                }
+            }
+        }, useCache);
+        return out;
+    }
+    
     /**
      * Downloads an image to a specified storage file asynchronously and calls the onSuccessCallback with the resulting image.  
      * If useCache is true, then this will first try to load the image from Storage if it exists.
@@ -2468,6 +2549,53 @@ public void downloadImageToStorage(String storageFile, SuccessCallback<Image> on
         downloadImageToStorage(storageFile, onSuccess, onFail, true);
     }
 
+    /**
+     * Downloads an image to a the file system asynchronously returning an AsyncResource object that resolves to the loaded image..  
+     * If useCache is true, then this will first try to load the image from Storage if it exists.
+     * 
+     * @param file The storage file where the file should be saved.
+     * @param useCache If true, then this will first check the storage to see if the image is already downloaded.
+     * @return AsyncResource resolving to the downloaded image.
+     * @since 7.0
+     */
+    public AsyncResource<Image> downloadImageToFileSystem(String file, boolean useCache) {
+        final AsyncResource<Image> out = new AsyncResource<Image>();
+        downloadImageToFileSystem(file, new SuccessCallback<Image>() {
+            @Override
+            public void onSucess(Image value) {
+                if (out.isDone()) {
+                    return;
+                }
+                out.complete(value);
+            }
+        }, new FailureCallback<Image>() {
+            @Override
+            public void onError(Object sender, Throwable err, int errorCode, String errorMessage) {
+                if (out.isDone()) {
+                    return;
+                }
+                out.error(err);
+            }
+        }, useCache);
+        return out;
+    }
+    
+    
+    /**
+     * Downloads an image to a the file system asynchronously returning an AsyncResource object that resolves to the loaded image..  
+     * If useCache is true, then this will first try to load the image from Storage if it exists.  This is a wrapper around {@link #downloadImageToFileSystem(java.lang.String, boolean) }
+     * with {@literal true} as the 2nd parameter.
+     * 
+     * @param file The storage file where the file should be saved.
+     
+     * @return AsyncResource resolving to the downloaded image.
+     * @since 7.0
+     */
+    public AsyncResource<Image> downloadImageToFileSystem(String file) {
+        return downloadImageToFileSystem(file, true);
+    }
+    
+    
     /**
      * Downloads an image to a the file system asynchronously and calls the onSuccessCallback with the resulting image.  
      * If useCache is true, then this will first try to load the image from Storage if it exists.

CodenameOne/src/com/codename1/io/NetworkManager.java

@@ -30,6 +30,7 @@
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
 import com.codename1.ui.util.EventDispatcher;
+import com.codename1.util.AsyncResource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -623,6 +624,53 @@ public void addDefaultHeader(String key, String value) {
         userHeaders.put(key, value);
     }
 
+    /**
+     * Identical to add to queue but returns an AsyncResource object that will resolve to
+     * the ConnectionRequest.
+     * 
+     * @param request the request object to add.
+     * @return AsyncResource resolving to the connection request on complete.
+     * @since 7.0
+     */
+    public AsyncResource<ConnectionRequest> addToQueueAsync(final ConnectionRequest request) {
+        final AsyncResource<ConnectionRequest> out = new AsyncResource<ConnectionRequest>();
+        class WaitingClass implements ActionListener<NetworkEvent> {
+            
+
+            public void actionPerformed(NetworkEvent e) {
+                if(e.getError() != null) {
+                    
+                    removeProgressListener(this);
+                    removeErrorListener(this);
+                    if (!out.isDone()) {
+                        out.error(e.getError());
+                    }
+                    return;
+                }
+                if(e.getConnectionRequest() == request) {
+                    if(e.getProgressType() == NetworkEvent.PROGRESS_TYPE_COMPLETED) {
+                        if(request.retrying) {
+                            request.retrying = false;
+                            return;
+                        }
+                        
+                        removeProgressListener(this);
+                        removeErrorListener(this);
+                        if (!out.isDone()) {
+                            out.complete(request);
+                        }
+                        return;
+                    }
+                }
+            }
+        }
+        WaitingClass w = new WaitingClass();
+        addProgressListener(w);
+        addErrorListener(w);
+        addToQueue(request);
+        return out;
+    }
+    
     /**
      * Identical to add to queue but waits until the request is processed in the queue,
      * this is useful for completely synchronous operations. 

CodenameOne/src/com/codename1/io/rest/RequestBuilder.java

@@ -404,7 +404,13 @@ public Response<String> getAsString() {
         CN.addToQueueAndWait(request);
         Response res = null;
         try {
-            res = new Response(request.getResponseCode(), new String(request.getResponseData(), "UTF-8"), request.getResponseErrorMessage());
+            byte[] respData = request.getResponseData();
+            String resp = null;
+            if(respData != null) {
+                resp = new String(respData, "UTF-8");
+            }
+            res = new Response(request.getResponseCode(), resp, 
+                request.getResponseErrorMessage());
         } catch (UnsupportedEncodingException ex) {
             ex.printStackTrace();
         }