Author: yradtsevich Date: 2012-04-18 13:00:38 -0400 (Wed, 18 Apr 2012) New Revision: 40297 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java Log: https://issues.jboss.org/browse/JBIDE-11053 : skinned browsersim should provide a way to rotate phone "on" the skin -code refactoring Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-18 14:58:10 UTC (rev 40296) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-18 17:00:38 UTC (rev 40297) @@ -1,14 +1,21 @@ package org.jboss.tools.vpe.browsersim.ui.skin; +import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; -public interface DeviceComposite { +public abstract class DeviceComposite extends Composite { + protected Composite bodyComposite; + public DeviceComposite(Composite parent, int style) { + super(parent, style); + } + public abstract ImageButtonComposite getBackButtonComposite(); public abstract ImageButtonComposite getForwardButtonComposite(); @@ -29,16 +36,51 @@ public abstract StyledText getPageTitleStyledText(); - public abstract void addListener(int eventType, Listener listener); + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener) + */ + @Override + public void addListener(int eventType, Listener listener) { + super.addListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + bodyComposite.addListener(eventType, listener); + for (Control child : bodyComposite.getChildren()) { + child.addListener(eventType, listener); + } + } + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener) + */ + @Override + public void removeListener(int eventType, Listener listener) { + super.removeListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + bodyComposite.removeListener(eventType, listener); + for (Control child :bodyComposite.getChildren()) { + child.removeListener(eventType, listener); + } + } + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu) + */ + @Override + public void setMenu(Menu menu) { + super.setMenu(menu); + bodyComposite.setMenu(menu); + for (Control child :bodyComposite.getChildren()) { + child.setMenu(menu); + } + } - public abstract void removeListener(int eventType, Listener listener); - - public abstract void setMenu(Menu menu); - - ImageButtonComposite getHomeButtonComposite(); - - public abstract Menu getMenu(); - - public abstract void dispose(); - + public abstract ImageButtonComposite getHomeButtonComposite(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-18 14:58:10 UTC (rev 40296) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-18 17:00:38 UTC (rev 40297) @@ -10,17 +10,14 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; -import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; -public class AndroidComposite extends Composite implements DeviceComposite { +public class AndroidComposite extends DeviceComposite { private ImageList imageList; private Composite androidOsCompositeContainer; @@ -40,8 +37,6 @@ private ImageButtonComposite homeButtonComposite; private ImageButtonComposite refreshButtonComposite; - private Composite bodyComposite; - /** * Create the composite. * @param parent @@ -207,50 +202,4 @@ public StyledText getPageTitleStyledText() { return null; } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener) - */ - @Override - public void addListener(int eventType, Listener listener) { - super.addListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - bodyComposite.addListener(eventType, listener); - for (Control child : bodyComposite.getChildren()) { - child.addListener(eventType, listener); - } - } - } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener) - */ - @Override - public void removeListener(int eventType, Listener listener) { - super.removeListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - bodyComposite.removeListener(eventType, listener); - for (Control child :bodyComposite.getChildren()) { - child.removeListener(eventType, listener); - } - } - } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu) - */ - @Override - public void setMenu(Menu menu) { - super.setMenu(menu); - bodyComposite.setMenu(menu); - for (Control child :bodyComposite.getChildren()) { - child.setMenu(menu); - } - } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-18 14:58:10 UTC (rev 40296) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-18 17:00:38 UTC (rev 40297) @@ -9,18 +9,15 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; -import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; -public class AppleIPhoneComposite extends Composite implements DeviceComposite { +public class AppleIPhoneComposite extends DeviceComposite { private ImageList imageList; private Composite iOsCompositeContainer; @@ -38,8 +35,6 @@ private ImageButtonComposite forwardButtonComposite; private ImageButtonComposite backButtonComposite; - private Composite bodyComposite; - /** * Create the composite. * @param parent @@ -196,53 +191,7 @@ return navBarComposite.getPageTitleStyledText(); } - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener) - */ @Override - public void addListener(int eventType, Listener listener) { - super.addListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - bodyComposite.addListener(eventType, listener); - for (Control child : bodyComposite.getChildren()) { - child.addListener(eventType, listener); - } - } - } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener) - */ - @Override - public void removeListener(int eventType, Listener listener) { - super.removeListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - bodyComposite.removeListener(eventType, listener); - for (Control child :bodyComposite.getChildren()) { - child.removeListener(eventType, listener); - } - } - } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu) - */ - @Override - public void setMenu(Menu menu) { - super.setMenu(menu); - bodyComposite.setMenu(menu); - for (Control child :bodyComposite.getChildren()) { - child.setMenu(menu); - } - } - - @Override public ImageButtonComposite getHomeButtonComposite() { return null; }