Author: yradtsevich Date: 2011-11-21 11:23:19 -0500 (Mon, 21 Nov 2011) New Revision: 36498 Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/AbstractWebKitBrowser.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/PlatformUtil.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/WebKitBrowserFactory.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/ Removed: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/ Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - renaming org.jboss.tools.browsersim.webkit to org.jboss.tools.browsersim.browser, part 2 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF 2011-11-21 16:23:19 UTC (rev 36498) @@ -5,5 +5,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0", - org.jboss.tools.browsersim.webkit;bundle-version="1.0.0" + org.jboss.tools.browsersim.browser;bundle-version="1.0.0" Export-Package: org.jboss.tools.browsersim.ui 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-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -44,13 +44,13 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; +import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; +import org.jboss.tools.browsersim.browser.WebKitBrowserFactory; import org.jboss.tools.browsersim.model.Device; import org.jboss.tools.browsersim.model.DevicesList; import org.jboss.tools.browsersim.model.DevicesListHolder; import org.jboss.tools.browsersim.model.DevicesListStorage; import org.jboss.tools.browsersim.util.ResourcesUtil; -import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; -import org.jboss.tools.browsersim.webkit.WebKitBrowserFactory; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/.project 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/.project 2011-11-21 16:23:19 UTC (rev 36498) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.browsersim.webkit</name> + <name>org.jboss.tools.browsersim.browser</name> <comment></comment> <projects> </projects> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/META-INF/MANIFEST.MF 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/META-INF/MANIFEST.MF 2011-11-21 16:23:19 UTC (rev 36498) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebKit -Bundle-SymbolicName: org.jboss.tools.browsersim.webkit;singleton:=true +Bundle-SymbolicName: org.jboss.tools.browsersim.browser;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-ExtensibleAPI: true -Export-Package: org.jboss.tools.browsersim.webkit +Export-Package: org.jboss.tools.browsersim.browser Require-Bundle: org.eclipse.swt;bundle-version="3.7.0" Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/AbstractWebKitBrowser.java (from rev 36497, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/AbstractWebKitBrowser.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/AbstractWebKitBrowser.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/AbstractWebKitBrowser.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.browser; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.widgets.Composite; + +/** + * @author Yahor Radtsevich (yradtsevich) + */ +public abstract class AbstractWebKitBrowser extends Browser { + + private String defaultUserAgent; + + public AbstractWebKitBrowser(Composite parent, int style) { + super(parent, style | SWT.WEBKIT); + } + + @Override + protected void checkSubclass() { + } + + @Override + public boolean setUrl(String url, String postData, String[] headers) { + setCustomUserAgent(defaultUserAgent); + boolean result = super.setUrl(url, postData, headers); + setCustomUserAgent(defaultUserAgent); + return result; + } + + public void setDefaultUserAgent(String defaultUserAgent) { + this.defaultUserAgent = defaultUserAgent; + setCustomUserAgent(defaultUserAgent); + } + + protected abstract void setCustomUserAgent(String userAgent); +} Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/PlatformUtil.java (from rev 36497, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/PlatformUtil.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/PlatformUtil.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.browser; + +import org.eclipse.swt.SWT; + +/** + * @author "Yahor Radtsevich (yradtsevich)" + */ +public class PlatformUtil { + + public static final String CURRENT_PLATFORM; + static { + String os = getOs(); + String ws = getWs(); + String arch = getArch(); + + CURRENT_PLATFORM = ws + '.' + os + ("macosx".equals(os) ? "" : '.' + arch); + } + + + /* + * Copy of org.eclipse.swt.internal.Library.arch() + */ + private static String getArch() { + String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ + if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ + if (osArch.equals ("IA64N")) return "ia64_32"; //$NON-NLS-1$ $NON-NLS-2$ + if (osArch.equals ("IA64W")) return "ia64"; //$NON-NLS-1$ $NON-NLS-2$ + return osArch; + } + + /* + * Copy of org.eclipse.swt.internal.Library.os() + */ + private static String getOs() { + String osName = System.getProperty("os.name"); //$NON-NLS-1$ + if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.equals ("Solaris") || osName.equals ("SunOS")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ + return osName; + } + + private static String getWs() { + return SWT.getPlatform(); + } +} Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/WebKitBrowserFactory.java (from rev 36497, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/WebKitBrowserFactory.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/WebKitBrowserFactory.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.browser; + +import org.eclipse.swt.SWTError; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.browsersim.browser.internal.WebKitBrowser_gtk_linux_x86; +import org.jboss.tools.browsersim.browser.internal.WebKitBrowser_gtk_linux_x86_64; +import org.jboss.tools.browsersim.browser.internal.WebKitBrowser_webkit_cocoa_macos; +import org.jboss.tools.browsersim.browser.internal.WebKitBrowser_win32_win32_x86; + +/** + * @author "Yahor Radtsevich (yradtsevich)" + */ +public class WebKitBrowserFactory { + public static AbstractWebKitBrowser createWebKitBrowser(Composite parent, int style) { + if (PlatformUtil.CURRENT_PLATFORM.equals("gtk.linux.x86")) { + return new WebKitBrowser_gtk_linux_x86(parent, style); + } else if (PlatformUtil.CURRENT_PLATFORM.equals("gtk.linux.x86_64")) { + return new WebKitBrowser_gtk_linux_x86_64(parent, style); + } else if (PlatformUtil.CURRENT_PLATFORM.equals("cocoa.macosx")) { + return new WebKitBrowser_webkit_cocoa_macos(parent, style); + } else if (PlatformUtil.CURRENT_PLATFORM.equals("win32.win32.x86")) { + return new WebKitBrowser_win32_win32_x86(parent, style); + } + + throw new SWTError("Unsupported Platform"); + } +} Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.webkit.internal; +package org.jboss.tools.browsersim.browser.internal; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -16,7 +16,7 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; +import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.webkit.internal; +package org.jboss.tools.browsersim.browser.internal; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -16,7 +16,7 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; +import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.webkit.internal; +package org.jboss.tools.browsersim.browser.internal; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -16,7 +16,7 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; +import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_win32_win32_x86.java 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.webkit.internal; +package org.jboss.tools.browsersim.browser.internal; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -16,7 +16,7 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; +import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-21 16:23:19 UTC (rev 36498) @@ -6,7 +6,7 @@ Bundle-Activator: org.jboss.tools.browsersim.eclipse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.browsersim.webkit;bundle-version="1.0.0", + org.jboss.tools.browsersim.browser;bundle-version="1.0.0", org.eclipse.core.resources, org.eclipse.jface.text, org.eclipse.ui.editors, Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-21 16:21:13 UTC (rev 36497) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-21 16:23:19 UTC (rev 36498) @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.ConfigurationScope; -import org.jboss.tools.browsersim.webkit.PlatformUtil; +import org.jboss.tools.browsersim.browser.PlatformUtil; /** * @author "Yahor Radtsevich (yradtsevich)" @@ -27,7 +27,7 @@ String pathSeparator = System.getProperty("path.separator"); String classPath = getBundleLocation("org.jboss.tools.browsersim") + "bin/" - + pathSeparator + getBundleLocation("org.jboss.tools.browsersim.webkit") + "bin/" + + pathSeparator + getBundleLocation("org.jboss.tools.browsersim.browser") + "bin/" + pathSeparator + getBundleLocation("org.eclipse.swt") + pathSeparator + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM); String javaCommand = System.getProperty("java.home") + "/bin/java";