Author: yradtsevich Date: 2012-04-10 17:07:25 -0400 (Tue, 10 Apr 2012) New Revision: 40121 Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/03.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/04.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/05.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/06.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/07.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/14.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/16.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/17.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/18.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/19.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/20.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/21.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java Log: https://issues.jboss.org/browse/JBIDE-10945 : BrowserSim: create more skins - creation of Android skin in progress Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java 2012-04-10 18:53:31 UTC (rev 40120) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java 2012-04-10 21:07:25 UTC (rev 40121) @@ -1,12 +1,12 @@ package org.jboss.tools.vpe.browsersim.model; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin; import org.jboss.tools.vpe.browsersim.ui.skin.NativeSkin; +import org.jboss.tools.vpe.browsersim.ui.skin.android.AndroidResizableSkin; import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone3ResizableSkin; public class SkinMap { @@ -18,6 +18,7 @@ map = new HashMap<String, Class<? extends BrowserSimSkin>>(); map.put("Apple iPhone 3", AppleIPhone3ResizableSkin.class); + map.put("Android", AndroidResizableSkin.class); } public static SkinMap getInstance() { Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/03.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/03.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/04.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/04.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/05.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/05.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/06.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/06.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/07.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/07.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/14.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/14.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/16.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/17.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/17.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/18.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/18.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/19.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/19.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/20.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/20.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/21.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/droid/vertical/21.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java 2012-04-10 21:07:25 UTC (rev 40121) @@ -0,0 +1,113 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.android; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone3ResizableSkin; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.IPhoneSkinDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.ImageDescriptor; + +public class AndroidResizableSkin extends AppleIPhone3ResizableSkin { + private static final Point NORMAL_SKREEN_SIZE = new Point(240, 1); + private static final Point NORMAL_SKIN_SIZE = new Point(339, 186); + private static final Point VERTICAL_BORDERS_SIZE = new Point(NORMAL_SKIN_SIZE.x - NORMAL_SKREEN_SIZE.x, NORMAL_SKIN_SIZE.y - NORMAL_SKREEN_SIZE.y); + private static final Point HORIZONTAL_BORDERS_SIZE = new Point(VERTICAL_BORDERS_SIZE.y, VERTICAL_BORDERS_SIZE.x); + private static final IPhoneSkinDescriptor VERTICAL_IPHONE3_DESCRIPTOR; + static { + String bd = "android/droid/vertical/"; + ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 3, 1, SWT.VERTICAL | SWT.HORIZONTAL); + ImageDescriptor[] bodyGridImageDescriptors = { + new ImageDescriptor(bd + "03.png"), new ImageDescriptor(bd + "04.png"), new ImageDescriptor(bd + "05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "06.png"), new ImageDescriptor(bd + "07.png"), + new ImageDescriptor(bd + "14.png", 1, 1, SWT.VERTICAL), iOsDescriptor, new ImageDescriptor(bd + "16.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "17.png"), new ImageDescriptor(bd + "18.png"), new ImageDescriptor(bd + "19.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "20.png"), new ImageDescriptor(bd + "21.png") + }; + int bodyGridSize = 5; + + String bd2 = "ios/"; + ButtonDescriptor backButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 52); + formData.bottom = new FormAttachment(100, -132); + backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png"); + } + + ButtonDescriptor forwardButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 115); + formData.bottom = new FormAttachment(100, -132); + forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png"); + } + VERTICAL_IPHONE3_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor); + } + private static final IPhoneSkinDescriptor HORIZONTAL_IPHONE3_DESCRIPTOR; + static { + String bd = "ios/iphone3/horizontal/"; + ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 5, 5, SWT.VERTICAL | SWT.HORIZONTAL); + ImageDescriptor[] bodyGridImageDescriptors = { + new ImageDescriptor(bd + "01.png"), new ImageDescriptor(bd + "02.png"), new ImageDescriptor(bd + "03.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "04.png"), new ImageDescriptor(bd + "05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "06.png"), new ImageDescriptor(bd + "07.png"), + new ImageDescriptor(bd + "08.png"), iOsDescriptor, new ImageDescriptor(bd + "10.png"), + new ImageDescriptor(bd + "11.png", 1, 1, SWT.VERTICAL), new ImageDescriptor(bd + "12.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "13.png"), new ImageDescriptor(bd + "14.png"), + new ImageDescriptor(bd + "15.png", 1, 1, SWT.VERTICAL), new ImageDescriptor(bd + "16.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "17.png"), new ImageDescriptor(bd + "18.png"), + new ImageDescriptor(bd + "19.png"), new ImageDescriptor(bd + "20.png"), new ImageDescriptor(bd + "21.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "22.png"), new ImageDescriptor(bd + "23.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "24.png"), new ImageDescriptor(bd + "25.png"), + }; + int bodyGridSize = 7; + String bd2 = "ios/"; + ButtonDescriptor backButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 145); + formData.bottom = new FormAttachment(100, -36); + backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png"); + } + + ButtonDescriptor forwardButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 247); + formData.bottom = new FormAttachment(100, -36); + forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png"); + } + HORIZONTAL_IPHONE3_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor); + } + + @Override + protected Point getBordersSize(boolean vertical) { + Point bordersSize = vertical ? VERTICAL_BORDERS_SIZE : HORIZONTAL_BORDERS_SIZE; + return bordersSize; + } + + @Override + protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) { + IPhoneSkinDescriptor skinDescriptor; + if (vertical) { + skinDescriptor = VERTICAL_IPHONE3_DESCRIPTOR; + } else { + skinDescriptor = HORIZONTAL_IPHONE3_DESCRIPTOR; + } + return skinDescriptor; + } + + @Override + protected int[] getNormalRegion(boolean vertical) { + int[] normalRegion = new int[8]; + normalRegion[0] = 0; + normalRegion[1] = 0; + + normalRegion[2] = 339; + normalRegion[3] = 0; + + normalRegion[4] = 339; + normalRegion[5] = 186; + + normalRegion[6] = 0; + normalRegion[7] = 186; + + return normalRegion; + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-10 18:53:31 UTC (rev 40120) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-10 21:07:25 UTC (rev 40121) @@ -126,13 +126,8 @@ } private void setShellRegion() { - int[] normalRegion; - if (vertical) { - normalRegion = AppleIPhone3Skin.VISIBLE_REGION[0]; - } else { - normalRegion = AppleIPhone3Skin.VISIBLE_REGION[1]; - } - + int[] normalRegion = getNormalRegion(vertical); + Point normalRegionSize = new Point(0, 0); for (int i = 0; i < normalRegion.length; i += 2) { if (normalRegionSize.x < normalRegion[i]) { @@ -317,19 +312,14 @@ iPhoneComposite.setMenu(null); AppleIPhoneComposite oldIPhoneComposite = iPhoneComposite; - IPhoneSkinDescriptor skinDescriptor; - if (vertical) { - skinDescriptor = VERTICAL_IPHONE3_DESCRIPTOR; - } else { - skinDescriptor = HORIZONTAL_IPHONE3_DESCRIPTOR; - } + IPhoneSkinDescriptor skinDescriptor = getSkinDescriptor(vertical); iPhoneComposite = new AppleIPhoneComposite(shell, skinDescriptor); bindIPhoneCompositeControls(); Composite browserContainer = iPhoneComposite.getBrowserContainer(); browserContainer.setLayout(new FillLayout()); browser.setParent(browserContainer); oldIPhoneComposite.dispose(); - Point bordersSize = vertical ? VERTICAL_BORDERS_SIZE : HORIZONTAL_BORDERS_SIZE; + Point bordersSize = getBordersSize(vertical); int shellWidth; if (browserSize.x == SWT.DEFAULT) { shellWidth = SWT.DEFAULT; @@ -355,6 +345,31 @@ iPhoneComposite.setMenu(contextMenu); } + protected Point getBordersSize(boolean vertical) { + Point bordersSize = vertical ? VERTICAL_BORDERS_SIZE : HORIZONTAL_BORDERS_SIZE; + return bordersSize; + } + + protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) { + IPhoneSkinDescriptor skinDescriptor; + if (vertical) { + skinDescriptor = VERTICAL_IPHONE3_DESCRIPTOR; + } else { + skinDescriptor = HORIZONTAL_IPHONE3_DESCRIPTOR; + } + return skinDescriptor; + } + + protected int[] getNormalRegion(boolean vertical) { + int[] normalRegion; + if (vertical) { + normalRegion = AppleIPhone3Skin.VISIBLE_REGION[0]; + } else { + normalRegion = AppleIPhone3Skin.VISIBLE_REGION[1]; + } + return normalRegion; + } + @Override public void setAddressBarVisible(boolean visible) { iPhoneComposite.setNavBarCompositeVisible(visible); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-10 18:53:31 UTC (rev 40120) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-10 21:07:25 UTC (rev 40121) @@ -9,7 +9,7 @@ import org.eclipse.swt.widgets.Composite; -class ImageDescriptor extends WidgetDescriptor { +public class ImageDescriptor extends WidgetDescriptor { protected String imageName; public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan, int stretching) {