Author: yradtsevich Date: 2011-11-19 04:55:17 -0500 (Sat, 19 Nov 2011) New Revision: 36467 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - added support of default width\height\user-agent, part 2 - added more devices Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -17,19 +17,11 @@ * @author Yahor Radtsevich (yradtsevich) */ public class DevicesListHolder extends Observable { - private static DevicesListHolder instance; private DevicesList devicesList; - protected DevicesListHolder() { + public DevicesListHolder() { } - - public static DevicesListHolder getInstance() { - if (instance == null) { - instance = new DevicesListHolder(); - } - return instance; - } - + public DevicesList getDevicesList() { return devicesList; } Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -108,7 +108,7 @@ if (nextLine != null) { selectedDeviceIndex = Integer.parseInt(nextLine); } - Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]*)\\t([0-9]*)(\\t(.*))?$"); + Pattern devicePattern = Pattern.compile("^(.*)\\t(\\-?[0-9]*)\\t(\\-?[0-9]*)(\\t(.*))?$"); List<Device> devices = new ArrayList<Device>(); while ((nextLine = reader.readLine()) != null) { Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg 2011-11-19 09:55:17 UTC (rev 36467) @@ -1,7 +1,15 @@ 0 -Default 0 0 -Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 -Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 -Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 +PC (Default) -1 -1 +Apple iPad 2 (Portrait) 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 +Apple iPad 2 (Landscape) 1024 768 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 +Apple iPhone 3 (Portrait) 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 +Apple iPhone 3 (Landscape) 480 320 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 +Apple iPhone 4 (Portrait) 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 +Apple iPhone 4 (Landscape) 960 640 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ -Samsung Galaxy S II 640 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 +Samsung Galaxy S (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 +Samsung Galaxy S (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 +Samsung Galaxy S II (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 +Samsung Galaxy S II (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 +Samsung Galaxy Tab 10.1 (Portrait) 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 +Samsung Galaxy Tab 10.1 (Landscape) 1280 800 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -10,11 +10,8 @@ ******************************************************************************/ package org.jboss.tools.browsersim.ui; -import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Observable; import java.util.Observer; @@ -68,7 +65,7 @@ private ProgressBar progressBar; private String initialUrl; private Menu devicesMenu; - private DevicesListHolder devicesManager; + private DevicesListHolder devicesListHolder; public static void main(String[] args) { String initialUrl; @@ -97,8 +94,8 @@ shell = new Shell(display); shell.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - if (devicesManager != null) { - DevicesListStorage.saveUserDefinedDevicesList(devicesManager.getDevicesList()); + if (devicesListHolder != null) { + DevicesListStorage.saveUserDefinedDevicesList(devicesListHolder.getDevicesList()); } } }); @@ -184,6 +181,7 @@ } }); + devicesListHolder = new DevicesListHolder(); fillMenuBar(appMenuBar); locationText.addListener(SWT.DefaultSelection, new Listener() { @@ -192,7 +190,7 @@ } }); - DevicesList devicesList = DevicesListHolder.getInstance().getDevicesList(); + DevicesList devicesList = devicesListHolder.getDevicesList(); if (devicesList != null && devicesList.getDevices() != null && devicesList.getSelectedDeviceIndex() < devicesList.getDevices().size()) { setDevice(devicesList.getDevices().get(devicesList.getSelectedDeviceIndex())); @@ -287,8 +285,7 @@ }); devicesMenu = createDropDownMenu(appMenuBar, Messages.BrowserSim_DEVICES); - devicesManager = DevicesListHolder.getInstance(); - devicesManager.addObserver(new Observer() { + devicesListHolder.addObserver(new Observer() { public void update(Observable o, Object arg) { DevicesListHolder devicesManager = (DevicesListHolder) o; DevicesList devicesList = devicesManager.getDevicesList(); @@ -309,8 +306,8 @@ devicesList = DevicesListStorage.loadDefaultDevicesList(); } - devicesManager.setDevicesList(devicesList); - devicesManager.notifyObservers(); + devicesListHolder.setDevicesList(devicesList); + devicesListHolder.notifyObservers(); new MenuItem(devicesMenu, SWT.BAR); MenuItem manageDevicesMenuItem = new MenuItem(devicesMenu, SWT.PUSH); @@ -318,10 +315,10 @@ manageDevicesMenuItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { DevicesList newDevicesList = new ManageDevicesDialog(shell, SWT.APPLICATION_MODAL | SWT.SHELL_TRIM, - devicesManager.getDevicesList()).open(); + devicesListHolder.getDevicesList()).open(); if (newDevicesList != null) { - devicesManager.setDevicesList(newDevicesList); - devicesManager.notifyObservers(); + devicesListHolder.setDevicesList(newDevicesList); + devicesListHolder.notifyObservers(); } } }); @@ -343,7 +340,7 @@ public void widgetSelected(SelectionEvent e) { MenuItem menuItem = (MenuItem)e.widget; if (menuItem.getSelection()) { - DevicesList devicesList = devicesManager.getDevicesList(); + DevicesList devicesList = devicesListHolder.getDevicesList(); int selectedDeviceIndex = devicesList.getDevices().indexOf(menuItem.getData()); if (selectedDeviceIndex < 0) { selectedDeviceIndex = 0; @@ -378,13 +375,13 @@ Rectangle clientArea = display.getClientArea(); int shellWidthHint = SWT.DEFAULT; - if (device.getWidth() != 0) { + if (device.getWidth() != Device.DEFAULT_SIZE) { data.widthHint = device.getWidth(); } else if (data.widthHint == SWT.DEFAULT) { shellWidthHint = clientArea.width; } int shellHeightHint = SWT.DEFAULT; - if (device.getHeight() != 0) { + if (device.getHeight() != Device.DEFAULT_SIZE) { data.heightHint = device.getHeight(); } else if (data.heightHint == SWT.DEFAULT) { shellHeightHint = clientArea.height; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -27,6 +27,9 @@ private Text textWidth; private Text textHeight; private Text textUserAgent; + private Button checkButtonWidth; + private Button checkButtonHeight; + private Button checkButtonUserAgent; /** * Create the dialog. @@ -68,29 +71,31 @@ shell.setLayout(new GridLayout(2, false)); Label labelName = new Label(shell, SWT.NONE); - labelName.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); labelName.setText(Messages.EditDeviceDialog_NAME); textName = new Text(shell, SWT.BORDER); textName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); textName.addFocusListener(new FocusGainedTextListener()); textName.setText(initialDevice.getName()); + + checkButtonWidth = new Button(shell, SWT.CHECK); + checkButtonWidth.setText(Messages.EditDeviceDialog_WIDTH); + checkButtonWidth.setSelection(initialDevice.getWidth() != Device.DEFAULT_SIZE); - Label labelWidth = new Label(shell, SWT.NONE); - labelWidth.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - labelWidth.setText(Messages.EditDeviceDialog_WIDTH); - textWidth = new Text(shell, SWT.BORDER); textWidth.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); textWidth.setTextLimit(4); textWidth.addVerifyListener(new VerifyDigitsListener()); textWidth.addFocusListener(new FocusLostDigitsListener()); textWidth.addFocusListener(new FocusGainedTextListener()); - textWidth.setText(String.valueOf(initialDevice.getWidth())); + if (initialDevice.getWidth() != Device.DEFAULT_SIZE) { + textWidth.setText(String.valueOf(initialDevice.getWidth())); + } + attachCheckBoxToText(checkButtonWidth, textWidth); - Label labelHeight = new Label(shell, SWT.NONE); - labelHeight.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - labelHeight.setText(Messages.EditDeviceDialog_HEIGHT); + checkButtonHeight = new Button(shell, SWT.CHECK); + checkButtonHeight.setText(Messages.EditDeviceDialog_HEIGHT); + checkButtonHeight.setSelection(initialDevice.getHeight() != Device.DEFAULT_SIZE); textHeight = new Text(shell, SWT.BORDER); textHeight.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); @@ -98,22 +103,24 @@ textHeight.addVerifyListener(new VerifyDigitsListener()); textHeight.addFocusListener(new FocusLostDigitsListener()); textHeight.addFocusListener(new FocusGainedTextListener()); - textHeight.setText(String.valueOf(initialDevice.getHeight())); + if (initialDevice.getHeight() != Device.DEFAULT_SIZE) { + textHeight.setText(String.valueOf(initialDevice.getHeight())); + } + attachCheckBoxToText(checkButtonHeight, textHeight); - Label labelUseragent = new Label(shell, SWT.NONE); - labelUseragent.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - labelUseragent.setText(Messages.EditDeviceDialog_USER_AGENT); + checkButtonUserAgent = new Button(shell, SWT.CHECK); + checkButtonUserAgent.setText(Messages.EditDeviceDialog_USER_AGENT); + checkButtonUserAgent.setSelection(initialDevice.getUserAgent() != null); textUserAgent = new Text(shell, SWT.BORDER); textUserAgent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); textUserAgent.addFocusListener(new FocusGainedTextListener()); if (initialDevice.getUserAgent() != null) { textUserAgent.setText(initialDevice.getUserAgent()); - } else { - textUserAgent.setText("Default User-Agent"); - textUserAgent.setEnabled(false); } + attachCheckBoxToText(checkButtonUserAgent, textUserAgent); + Composite composite = new Composite(shell, SWT.NONE); composite.setLayout(new FillLayout(SWT.HORIZONTAL)); composite.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, true, true, 2, 1)); @@ -122,8 +129,10 @@ buttonOk.setText(Messages.EditDeviceDialog_OK); buttonOk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - resultDevice = new Device(textName.getText(), Integer.valueOf(textWidth.getText()), - Integer.valueOf(textHeight.getText()), textUserAgent.isEnabled() ? textUserAgent.getText() : null); + resultDevice = new Device(textName.getText(), + checkButtonWidth.getSelection() ? Integer.valueOf("0" + textWidth.getText()) : Device.DEFAULT_SIZE, + checkButtonHeight.getSelection() ? Integer.valueOf("0" + textHeight.getText()) : Device.DEFAULT_SIZE, + checkButtonUserAgent.getSelection() ? textUserAgent.getText() : null); shell.close(); } }); @@ -138,6 +147,23 @@ } }); } + + private void attachCheckBoxToText(Button checkBox, final Text text) { + if (checkBox.getSelection()) { + text.setEnabled(true); + } else { + text.setEnabled(false); + } + checkBox.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + if (((Button)e.widget).getSelection()) { + text.setEnabled(true); + } else { + text.setEnabled(false); + } + } + }); + } } final class VerifyDigitsListener implements VerifyListener { Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -9,7 +9,6 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.browsersim.ui; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -31,7 +30,6 @@ import org.jboss.tools.browsersim.model.Device; import org.jboss.tools.browsersim.model.DevicesList; import org.jboss.tools.browsersim.model.DevicesListStorage; -import org.jboss.tools.browsersim.util.ResourcesUtil; /** * @author Yahor Radtsevich (yradtsevich) @@ -212,7 +210,12 @@ table.removeAll(); for (Device device : devices) { TableItem tableItem = new TableItem(table, SWT.NONE); - tableItem.setText(new String[] {device.getName(), String.valueOf(device.getWidth()), String.valueOf(device.getHeight()), device.getUserAgent()}); + tableItem.setText(new String[] { + device.getName(), + device.getWidth() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getWidth()), + device.getHeight() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getHeight()), + device.getUserAgent() == null ? Messages.ManageDevicesDialog_DEFAULT : device.getUserAgent() + }); } table.setSelection(selectedDeviceIndex); } Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-19 09:55:17 UTC (rev 36467) @@ -35,6 +35,7 @@ public static String EditDeviceDialog_WIDTH; public static String ManageDevicesDialog_ADD; public static String ManageDevicesDialog_CANCEL; + public static String ManageDevicesDialog_DEFAULT; public static String ManageDevicesDialog_DEVICES; public static String ManageDevicesDialog_EDIT; public static String ManageDevicesDialog_HEIGHT; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-19 01:14:21 UTC (rev 36466) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-19 09:55:17 UTC (rev 36467) @@ -16,6 +16,7 @@ EditDeviceDialog_WIDTH=Width: ManageDevicesDialog_ADD=Add ManageDevicesDialog_CANCEL=Cancel +ManageDevicesDialog_DEFAULT=DEFAULT ManageDevicesDialog_DEVICES=Devices ManageDevicesDialog_EDIT=Edit ManageDevicesDialog_HEIGHT=Height