Fix advanced topics demos imports and callback snippet

Author: shai-almog

docs/demos/common/src/main/java/com/codenameone/developerguide/advancedtheming/PsdTutorialDemo.java

@@ -1,21 +1,21 @@
 package com.codenameone.developerguide.advancedtheming;
 
 import com.codename1.io.Log;
-import com.codename1.ui.BorderLayout;
 import com.codename1.ui.Button;
 import com.codename1.ui.Command;
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
 import com.codename1.ui.Form;
 import com.codename1.ui.Label;
-import com.codename1.ui.TableLayout;
 import com.codename1.ui.TextField;
 import com.codename1.ui.Toolbar;
 import com.codename1.ui.layouts.BoxLayout;
+import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.LayeredLayout;
 import com.codename1.ui.plaf.Style;
 import com.codename1.ui.util.Resources;
 import com.codename1.ui.FontImage;
+import com.codename1.ui.table.TableLayout;
 
 /**
  * Code sample from the PSD to theme conversion tutorial.

docs/demos/common/src/main/java/com/codenameone/developerguide/advancedtopics/CenterLayoutDemo.java

@@ -2,12 +2,11 @@
 
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
-import com.codename1.ui.Dimension;
 import com.codename1.ui.Form;
 import com.codename1.ui.Label;
-import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.Layout;
 import com.codename1.ui.plaf.Style;
+import com.codename1.ui.geom.Dimension;
 
 // tag::centerLayout[]
 class CenterLayout extends Layout {

docs/demos/common/src/main/java/com/codenameone/developerguide/advancedtopics/RearrangeableItemsDemo.java

@@ -4,7 +4,7 @@
 import com.codename1.ui.Form;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
-import com.codename1.ui.list.MultiButton;
+import com.codename1.components.MultiButton;
 import java.util.Arrays;
 import java.util.Collections;
 

docs/demos/common/src/main/java/com/mycompany/NativeCallback.java

@@ -19,7 +19,7 @@ public static void callback(String arg) {
     // end::nativeCallbackString[]
 
     // tag::nativeCallbackReturn[]
-    public static int callback(int arg) {
+    public static int callbackR(int arg) {
         // do stuff
         return arg;
     }