Formatting changes for checkstyle (#3980)

Author: shai-almog

CodenameOne/src/com/codename1/ads/AdsService.java

@@ -6,18 +6,18 @@
  * 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 
+ *
+ * Please contact Codename One through http://www.codenameone.com/ if you
  * need additional information or have any questions.
  */
 package com.codename1.ads;
@@ -27,44 +27,30 @@
 import com.codename1.io.NetworkManager;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.html.HTMLComponent;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
  * This is an abstract Ads Service.
- * Each supported Ad network needs to extend this Service and to implement 
+ * Each supported Ad network needs to extend this Service and to implement
  * the initService method
- * 
+ *
  * @author Chen Fishbein
  */
 public abstract class AdsService extends ConnectionRequest {
 
+    private static Class service = InnerActive.class;
     private String currentAd;
     private boolean initialized = false;
-    private static Class service = InnerActive.class;
 
     /**
      * Empty constructor
      */
     protected AdsService() {
     }
 
-    /**
-     * Initialize the ads service.
-     */
-    public void initialize(Ads adsComponent) {
-        if (!initialized) {
-            initService(adsComponent);
-            initialized = true;
-        }
-    }
-    
-    /**
-     * init the service requests.
-     */
-    public abstract void initService(Ads adsComponent);
-
     /**
      * Creates a new AdsService to be used by the Ads Component
      */
@@ -83,12 +69,28 @@ public static AdsService createAdsService() {
 
     /**
      * Sets the provider of the ads service.
+     *
      * @param provider this class needs to extend the AdsService class
      */
-    public static void setAdsProvider(Class provider){
+    public static void setAdsProvider(Class provider) {
         service = provider;
     }
-    
+
+    /**
+     * Initialize the ads service.
+     */
+    public void initialize(Ads adsComponent) {
+        if (!initialized) {
+            initService(adsComponent);
+            initialized = true;
+        }
+    }
+
+    /**
+     * init the service requests.
+     */
+    public abstract void initService(Ads adsComponent);
+
     /**
      * Returns the last requested ad
      */
@@ -118,13 +120,14 @@ protected void readResponse(InputStream input) throws IOException {
         if (size > 0) {
             String s = new String(out.toByteArray(), 0, size, "UTF-8");
             currentAd = s;
-            fireResponseListener(new ActionEvent(currentAd,ActionEvent.Type.Response));
+            fireResponseListener(new ActionEvent(currentAd, ActionEvent.Type.Response));
         }
     }
 
     /**
      * This a callback method to inform to the service the Ad is displayed
-     * @param cmp 
+     *
+     * @param cmp
      */
     public void onAdDisplay(HTMLComponent cmp) {
     }

CodenameOne/src/com/codename1/ads/InnerActive.java

@@ -6,54 +6,47 @@
  * 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 
+ *
+ * Please contact Codename One through http://www.codenameone.com/ if you
  * need additional information or have any questions.
  */
 package com.codename1.ads;
 
 import com.codename1.components.Ads;
 import com.codename1.io.ConnectionRequest;
-import com.codename1.io.Storage;
 import com.codename1.ui.Display;
 import com.codename1.ui.events.ActionEvent;
-import com.codename1.ui.html.HTMLComponent;
+
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
  * This is an Ad service implementation by InnerActive see:
  * http://console.inner-active.com/iamp/publisher/register?ref_id=affiliate_CodenameOne
- * 
+ *
  * @author Chen
  */
-public class InnerActive extends AdsService{ // PMD Fix: UnusedPrivateField removed obsolete field
-    
-    private final String REQUEST_URL = "http://m2m1.inner-active.com/simpleM2M/clientRequestHtmlAd";
+public class InnerActive extends AdsService { // PMD Fix: UnusedPrivateField removed obsolete field
 
+    private static final String protocolVersion = "Sm2m-1.5.3";
+    private static boolean testAds = true;
+    private final String REQUEST_URL = "http://m2m1.inner-active.com/simpleM2M/clientRequestHtmlAd";
     //Distribution channel ID
     private int po = 559;
-
     private String os;
-
-    private static final String protocolVersion = "Sm2m-1.5.3";
-
     //UDID/IMEI
     private String hid;
-
     private boolean banner = true;
-    
-    private static boolean testAds = true;
 
     /**
      * Empty constructor of the inner active ads service.
@@ -67,62 +60,63 @@ private static void addParam(ConnectionRequest req, String key, String val) {
         }
     }
 
+    /**
+     * If true and no ads exists the network will return house holds ads
+     *
+     * @param test
+     */
+    public static void setTestAds(boolean test) {
+        testAds = test;
+    }
+
     /**
      * Sets this ads type, by default this a banner type.
-     * 
+     *
      * @param banner sets the ads to banners or text ads
      */
     public void setBanner(boolean banner) {
         this.banner = banner;
     }
 
-    /**
-     * If true and no ads exists the network will return house holds ads
-     * @param test
-     */
-    public static void setTestAds(boolean test) {
-        testAds = test;
-    }
-    
     /**
      * initialize the ads service
      */
-    public void initService(Ads ads){
+    public void initService(Ads ads) {
         this.os = Display.getInstance().getPlatformName();
-        if(os.equals("and")){
-            if(banner){
+        if (os.equals("and")) {
+            if (banner) {
                 po = 559;
-            }else{
-                po = 600;            
+            } else {
+                po = 600;
             }
-        }else if(os.equals("rim")){
-            if(banner){
-                po = 635;            
-            }else{
-                po = 634;            
+        } else if (os.equals("rim")) {
+            if (banner) {
+                po = 635;
+            } else {
+                po = 634;
             }
-        }else if(os.equals("ios")){
-            if(banner){
-                if(Display.getInstance().isTablet()){
-                    po = 947;                            
-                }else{
-                    po = 642;                            
+        } else if (os.equals("ios")) {
+            if (banner) {
+                if (Display.getInstance().isTablet()) {
+                    po = 947;
+                } else {
+                    po = 642;
                 }
-            }else{
-                if(Display.getInstance().isTablet()){
-                    po = 946;                            
-                }else{
-                    po = 632;            
+            } else {
+                if (Display.getInstance().isTablet()) {
+                    po = 946;
+                } else {
+                    po = 632;
                 }
             }
-        }else if(os.equals("me")){
-            if(banner){
-                po = 551;            
-            }else{
-                po = 519;            
+        } else if (os.equals("me")) {
+            if (banner) {
+                po = 551;
+            } else {
+                po = 519;
             }
         }
-        
+
         String url = REQUEST_URL;
         setPost(false);
         setUrl(url);
@@ -131,9 +125,9 @@ public void initService(Ads ads){
         //protocol version
         String version = protocolVersion;
         addParam(this, "v", version);
-        if(os.equals("ios")){
-            hid = Display.getInstance().getProperty("UDID", null);        
-        }else{
+        if (os.equals("ios")) {
+            hid = Display.getInstance().getProperty("UDID", null);
+        } else {
             hid = Display.getInstance().getProperty("IMEI", null);
         }
         addParam(this, "hid", hid);
@@ -144,19 +138,19 @@ public void initService(Ads ads){
         addParam(this, "a", ads.getAge());
         addParam(this, "g", ads.getGender());
         addParam(this, "c", ads.getCategory());
-        addParam(this, "l", ads.getLocation());        
-        
+        addParam(this, "l", ads.getLocation());
+
         addParam(this, "mn", Display.getInstance().getProperty("MSISDN", null));
-        String [] keywords = ads.getKeywords();
-        if(keywords != null && keywords.length > 0){
+        String[] keywords = ads.getKeywords();
+        if (keywords != null && keywords.length > 0) {
             int klen = keywords.length;
             String k = "";
             for (int i = 0; i < klen; i++) {
                 k += "," + keywords[i];
             }
             addParam(this, "k", k.substring(1));
-        }        
-        if(testAds){
+        }
+        if (testAds) {
             addParam(this, "test", "1");
         }
         setDuplicateSupported(true);
@@ -172,10 +166,10 @@ protected void readResponse(InputStream input) throws IOException {
         while ((len = input.read(buffer)) > 0) {
             String temp = new String(buffer, 0, len, "UTF-8");
             int endOfFile = temp.indexOf("/html>");
-            if( endOfFile > 0){
+            if (endOfFile > 0) {
                 buf.append(temp.toCharArray(), 0, endOfFile + 6);
                 break;
-            }else{
+            } else {
                 buf.append(temp);
             }
         }
@@ -187,7 +181,7 @@ protected void readResponse(InputStream input) throws IOException {
 //            Storage.getInstance().flushStorageCache();            
 //            addParam(this, "cid", cid);
 //        }
-        fireResponseListener(new ActionEvent(s,ActionEvent.Type.Response));        
+        fireResponseListener(new ActionEvent(s, ActionEvent.Type.Response));
     }
 
 }