180717_addingChangesFromCn1Repository

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing
+
+Thank you for your interest in Codename One! We have always been community driven and contibuting a pull request is the highest form of that.
+
+## Discussion
+
+Before you start working on something we would suggest talking to us in the [discussion forum](https://www.codenameone.com/discussion-forum.html) or asking a question on [stack overflow with the codenameone tag](http://stackoverflow.com/tags/codenameone). You can also contact us via the chat widget on the [main Codename One website](https://www.codenameone.com).
+
+There are a lot of nuances and pitfalls when making a change or even with submitting an issue and it's worthwhile to ask first so the issue is clear.
+
+Since Codename One is such a large project with so many different pieces contributing to each one of these pieces is a radically different process which is why discussion with the community is helpful.
+
+## Filing Issues
+
+Once we have a sense of what needs doing we suggest filing an issue so we can track the process. Filing an issue is a contibution in its own right. When you write clear concise issues with good test cases & screenshots we can assign them to a specific milestone and move the product forward more easily.
+
+## Documenting
+
+This is probably one of the most important things you can do as a contributor and probably one of the easiest things you can do. There are two big pieces of documentation you can edit right here on github!
+
+The first is the [JavaDoc](https://www.codenameone.com/javadoc/) which you can edit directly in the source code, if there is an ommission or a mistake you can just press the edit button on the file and make the change directly even without an IDE. These pull requests are highly appreciaed and will help future generations of developers!
+
+The [Codename One developer guide](https://www.codenameone.com/manual/) is genenrated from [the wiki pages of this project](https://github.com/codenameone/CodenameOne/wiki/) you can just [edit the wiki directly](https://www.codenameone.com/blog/wiki-parparvm-performance-actionevent-type.html) and your changes propogate into the developers guide. Don't forget to edit the authors section and add some credit!
+
+The wiki uses the asciidoc format to generate HTML & PDF versions. There are plenty of guides on the internet to asciidoc but the syntax is pretty simple. Please try to maintin the convention for the guide as we automate many pieces in the guide generation and conversion.
+
+## Working with the Source
+
+We have a blog post that covers forking, running the simulator and submitting a pull request [here](http://www.codenameone.com/blog/how-to-use-the-codename-one-sources.html). While it's pretty exhaustive it doesn't cover more esoteric features like ParparVM or the iKVM fork. For those our only reference is the source.
+
+## Ownership
+
+By contributing code you are granting Codename One shared ownership of your work. You still own it but Codename One will have the right to relicense your work based on our needs & treat this work as if it was developed by a Codename One engineer. This is important as we might need to provide propriatery licenses for commercial companies and we might want to change the general project license in the future to attract more developers.

CodenameOne/build.xml

@@ -80,7 +80,7 @@
             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${codenameone.dir}/CLDC11/src" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="../Ports/CLDC11/src" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -157,7 +157,7 @@
         <copy file="dist/CodenameOne.jar" todir="build/tmp" />
         <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="build/tmp" />
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="build/tmp" />
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="build/tmp" />        
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="build/tmp" />        
         <zip basedir="build/tmp" compress="true" file="updatedLibs.zip" />
         <deltree dir="build/tmp"/>        
     </target>
@@ -249,8 +249,8 @@
 
         <ant inheritall="false" antfile="../Ports/JavaSE/build.xml" target="clean" />
         <ant inheritall="false" antfile="../Ports/JavaSE/build.xml" target="jar" />
-        <ant inheritall="false" antfile="${codenameone.dir}/CLDC11/build.xml" target="clean" />
-        <ant inheritall="false" antfile="${codenameone.dir}/CLDC11/build.xml" target="jar" />
+        <ant inheritall="false" antfile="../Ports/CLDC11/build.xml" target="clean" />
+        <ant inheritall="false" antfile="../Ports/CLDC11/build.xml" target="jar" />
         <ant inheritall="false" antfile="../Ports/JavaSEWithSVGSupport/build.xml" target="clean" />
         <ant inheritall="false" antfile="../Ports/JavaSEWithSVGSupport/build.xml" target="jar" />
 
@@ -284,7 +284,7 @@
         <copydir src="../../SwiftnotesCN1" dest="build/CodenameOneDist/CodenameOne/demos/Swiftnotes" />        
 
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="build/CodenameOneDist/CodenameOne/demos" />
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="build/CodenameOneDist/CodenameOne/demos" />
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="build/CodenameOneDist/CodenameOne/demos" />
 
         <delete dir="build/tempsource" />
         <!-- this will get overriden the main value is keeping the package.html files -->
@@ -300,19 +300,10 @@
 
         <copy file="dist/CodenameOne.jar" todir="build/CodenameOneDist/CodenameOne/demos" />
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="../demos" />
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="../demos" />
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="../demos" />
         <copy file="dist/CodenameOne.jar" todir="../demos" />
         <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="../demos" />
 
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="${codenameone.dir}/IdeaPlugin/depedencies" />
-        <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="${codenameone.dir}/IdeaPlugin/depedencies" />
-        <copy file="dist/CodenameOne.jar" todir="${codenameone.dir}/IdeaPlugin/depedencies" />
-        <copy file="${codenameone.dir}/BuildClient/dist/CodenameOneBuildClient.jar" tofile="${codenameone.dir}/IdeaPlugin/depedencies/CodeNameOneBuildClient.jar" />
-
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="${codenameone.dir}/IdeaPlugin/resources/dependencies" />
-        <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="${codenameone.dir}/IdeaPlugin/resources/dependencies" />
-        <copy file="dist/CodenameOne.jar" todir="${codenameone.dir}/IdeaPlugin/resources/dependencies" />
-        <copy file="${codenameone.dir}/BuildClient/dist/CodenameOneBuildClient.jar" tofile="${codenameone.dir}/IdeaPlugin/resources/dependencies/CodeNameOneBuildClient.jar" />
 
         <delete>
             <fileset dir="build/CodenameOneDist/CodenameOne/demos" includes="**/*.jar" />
@@ -323,7 +314,7 @@
         <copy file="dist/CodenameOne.jar" todir="build/tmp" />
         <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="build/tmp" />
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="build/tmp" />
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="build/tmp" />        
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="build/tmp" />        
         <zip basedir="build/tmp" compress="true" file="repo/updatedLibs.zip" />
         <deltree dir="build/tmp"/>
 
@@ -369,7 +360,6 @@
         <ant inheritall="false" antfile="${codenameone.dir}/GUIBuilder/GUIBuilderSE/build.xml" target="pack" />
         <ant inheritall="false" antfile="../CodenameOneDesigner/build.xml" target="release" />
         <!-- zip basedir="../CodenameOneDesigner/dist" includes="designer.jar" file="../nightly_builds/CodenameOneDesigner_${tstamp}.zip" / -->
-        <copy file="../CodenameOneDesigner/dist/designer.jar" todir="${codenameone.dir}/IdeaPlugin/depedencies" />
 
         <!-- prepare the NB Plugin -->
         <property name="nbplugin" location="${codenameone.dir}/NBPlugin"/>
@@ -390,11 +380,11 @@
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="${nbplugin}/CodenameOnePlugin/release/modules/ext" />
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="${nbplugin}/CodenameOne_Template/" />
 
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="${nbplugin}/CodenameOne_Template/lib" />
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="${nbplugin}/LibraryProject/lib" />
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="${nbplugin}/CodenameOne_Template/lib" />
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="${nbplugin}/LibraryProject/lib" />
 
         <!-- Libs for Demos -->
-        <copy file="${codenameone.dir}/CLDC11/dist/CLDC11.jar" todir="../CodenameOnePlugin/src" />
+        <copy file="../Ports/CLDC11/dist/CLDC11.jar" todir="../CodenameOnePlugin/src" />
         <copy file="dist/CodenameOne.jar" todir="${codenameone.dir}/NBPlugin/CodenameOnePlugin/src"/>
         <copy file="build/CodenameOneDist/CodenameOne/demos/CodenameOne_SRC.zip" todir="${codenameone.dir}/NBPlugin/CodenameOnePlugin/src"/>
         <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="${codenameone.dir}/NBPlugin/CodenameOnePlugin/src" />

CodenameOne/src/cn1-version-numbers

@@ -1,2 +1 @@
-5ad4700144e6d2d647e4bfdbed729151640d4c7f
-2376
+3445dd3e0a4db4701e26d8401db66f4b092220eb

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2012, Codename One and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Codename One designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *  
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Codename One through http://www.codenameone.com/ if you 
+ * need additional information or have any questions.
+ */
+
+package com.codename1.components;
+
+import com.codename1.ui.Button;
+import com.codename1.ui.Component;
+import com.codename1.ui.Container;
+import com.codename1.ui.FontImage;
+import com.codename1.ui.TextArea;
+import com.codename1.ui.TextField;
+import com.codename1.ui.events.ActionEvent;
+import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.layouts.BorderLayout;
+import com.codename1.ui.plaf.Border;
+import com.codename1.ui.plaf.Style;
+
+/**
+ * Wraps a text field so it will have an X to clear its content on the right hand side
+ *
+ * @author Shai Almog
+ */
+public class ClearableTextField extends Container {
+    private ClearableTextField() {
+        super(new BorderLayout());
+    }
+
+    /**
+     * Wraps the given text field with a UI that will allow us to clear it
+     * @param tf the text field
+     * @param iconSize size in millimeters for the clear icon, -1 for default size
+     * @return a Container that should be added to the UI instead of the actual text field
+     */
+    public static ClearableTextField wrap(final TextArea tf, float iconSize) {
+        ClearableTextField cf = new ClearableTextField();
+        Button b = new Button("", tf.getUIID());
+        if(iconSize > 0) {
+            FontImage.setMaterialIcon(b, FontImage.MATERIAL_CLEAR, iconSize);
+        } else {
+            FontImage.setMaterialIcon(b, FontImage.MATERIAL_CLEAR);
+        }
+        removeCmpBackground(tf);
+        removeCmpBackground(b);
+        cf.setUIID(tf.getUIID());
+        cf.add(BorderLayout.CENTER, tf);
+        cf.add(BorderLayout.EAST, b);
+        b.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent evt) {
+                tf.stopEditing();
+                tf.setText("");
+                tf.startEditingAsync();
+            }
+        });
+        return cf;        
+    }
+
+    /**
+     * Wraps the given text field with a UI that will allow us to clear it
+     * @param tf the text field
+     * @return a Container that should be added to the UI instead of the actual text field
+     */
+    public static ClearableTextField wrap(final TextArea tf) {
+        return wrap(tf, -1);
+    }
+
+    private static void removeCmpBackground(Component cmp) {
+        Style s = cmp.getAllStyles();
+        s.setBorder(Border.createEmpty());
+        s.setBackgroundType(Style.BACKGROUND_NONE);
+        s.setBgTransparency(0);
+    }
+}

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

@@ -25,6 +25,7 @@
 import com.codename1.ui.Button;
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
+import com.codename1.ui.Display;
 import com.codename1.ui.Label;
 import com.codename1.ui.TextField;
 import com.codename1.ui.events.ActionEvent;
@@ -49,16 +50,21 @@
  * @author Shai Almog
  */
 public class FloatingHint extends Container {
+    private final TextField tf;
+    private final Button hintButton;
+    private final Label hintLabel;
+
     /**
      * Wraps a text field in a floating hint
      * @param tf the text field
      */
     public FloatingHint(final TextField tf) {
         super(new LayeredLayout());
+        this.tf = tf;
         Container content = new Container(new BorderLayout());
         add(content);
-        final Button hintButton = new Button(tf.getHint());
-        final Label hintLabel = new Label(tf.getHint());
+        hintButton = new Button(tf.getHint());
+        hintLabel = new Label(tf.getHint());
         tf.setHint("");
         hintButton.setFocusable(false);
         hintButton.setUIID("FloatingHint");
@@ -86,45 +92,71 @@ public void actionPerformed(ActionEvent evt) {
         }
         FocusListener fl = new FocusListener() {
             public void focusGained(Component cmp) {
-                if(isInitialized()) {
-                    if(!hintButton.isVisible()) {
-                        hintButton.setVisible(true);
-                        if(getComponentForm().grabAnimationLock()) {
-                            morphAndWait(hintLabel, hintButton, 150);
-                            getComponentForm().releaseAnimationLock();
-                        }
-                        hintLabel.setVisible(false);
-                        tf.getComponentForm().revalidate();
-                        tf.startEditingAsync();
-                    } else {
-                        tf.startEditingAsync();
-                    }
-                } else {
-                    boolean t = tf.getText() == null || tf.getText().length() == 0;
-                    hintButton.setVisible(t);
-                    hintLabel.setVisible(!t);
-                }
+                focusGainedImpl();
             }
 
             public void focusLost(Component cmp) {
-                if(isInitialized()) {
-                    if(tf.getText().length() == 0) {
-                        hintLabel.setVisible(true);
-                        if(getComponentForm().grabAnimationLock()) {
-                            morphAndWait(hintButton, hintLabel, 150);
-                            getComponentForm().releaseAnimationLock();
-                        }
-                        hintButton.setVisible(false);
-                        tf.getComponentForm().revalidate();
-                        revalidate();
-                    }
-                } else {
-                    boolean t = tf.getText() == null || tf.getText().length() == 0;
-                    hintButton.setVisible(!t);
-                    hintLabel.setVisible(t);
-                }
+                focusLostImpl();
             }
         };
         tf.addFocusListener(fl);
     }
+
+    private void focusGainedImpl() {
+        if(isInitialized()) {
+            if(!hintButton.isVisible()) {
+                hintButton.setVisible(true);
+                if(getComponentForm().grabAnimationLock()) {
+                    morphAndWait(hintLabel, hintButton, 150);
+                    getComponentForm().releaseAnimationLock();
+                }
+                hintLabel.setVisible(false);
+                tf.getComponentForm().revalidate();
+                tf.setEditable(true);
+                tf.startEditingAsync();
+            } else {
+                tf.setEditable(true);
+                tf.startEditingAsync();
+            }
+        } else {
+            boolean t = tf.getText() == null || tf.getText().length() == 0;
+            hintButton.setVisible(t);
+            hintLabel.setVisible(!t);
+            revalidate();
+        }
+    }
+
+    private void focusLostImpl() {
+        if(isInitialized()) {
+            if(tf.getText().length() == 0) {
+                hintLabel.setVisible(true);
+                if(getComponentForm().grabAnimationLock()) {
+                    morphAndWait(hintButton, hintLabel, 150);
+                    getComponentForm().releaseAnimationLock();
+                }
+                hintButton.setVisible(false);
+                tf.getComponentForm().revalidate();
+                revalidate();
+                tf.setEditable(false);
+            } 
+        } else {
+            boolean t = tf.getText() == null || tf.getText().length() == 0;
+            hintButton.setVisible(!t);
+            hintLabel.setVisible(t);
+            revalidate();
+        }
+    }
+
+    @Override
+    protected void initComponent() {
+        super.initComponent(); 
+        if (tf.hasFocus()) {
+            focusGainedImpl();
+        }
+
+    }
+
+
+
+
 }

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

@@ -51,7 +51,6 @@ public ScaleImageLabel() {
         setUIID("Label");
         setShowEvenIfBlank(true);
         getAllStyles().setBackgroundType(Style.BACKGROUND_IMAGE_SCALED_FIT);
-        getAllStyles().setBgTransparency(255);
     }
 
     /**
@@ -62,7 +61,6 @@ public ScaleImageLabel(Image i) {
         setUIID("Label");
         setShowEvenIfBlank(true);
         getAllStyles().setBackgroundType(Style.BACKGROUND_IMAGE_SCALED_FIT);
-        getAllStyles().setBgTransparency(255);
         setIcon(i);
     }
 
@@ -172,7 +170,6 @@ public void setUIID(String id) {
         super.setUIID(id); 
         setIcon(icon);
         getAllStyles().setBackgroundType(type);
-        getAllStyles().setBgTransparency(255);
     }
 
     @Override
@@ -182,7 +179,6 @@ protected void refreshTheme(String id, boolean merge) {
         super.refreshTheme(id, merge);
         setIcon(icon);
         getAllStyles().setBackgroundType(type);
-        getAllStyles().setBgTransparency(255);
     }
 
     /**