Author: yradtsevich Date: 2011-11-25 14:55:09 -0500 (Fri, 25 Nov 2011) New Revision: 36675 Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/AbstractWebKitBrowser.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/WebKitBrowserFactory.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/Activator.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/BrowserSimFactory.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/editors/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/handlers/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/ Removed: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/ Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/BrowserAllTests.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/WebKitTests.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/editors/BrowserSimEditorLauncher.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesList.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListHolder.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/NLS.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/ResourcesUtil.java Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - renaming packages to org.jboss.tools.vpe.browsersim* Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/.project 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/.project 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.browsersim</name> + <name>org.jboss.tools.vpe.browsersim</name> <comment></comment> <projects> </projects> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim -Bundle-SymbolicName: org.jboss.tools.browsersim;singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.browsersim;singleton:=true 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.browser;bundle-version="1.0.0" -Export-Package: org.jboss.tools.browsersim.ui + org.jboss.tools.vpe.browsersim.browser;bundle-version="1.0.0" +Export-Package: org.jboss.tools.vpe.browsersim.ui Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/model/Device.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.model; +package org.jboss.tools.vpe.browsersim.model; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesList.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/model/DevicesList.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesList.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.model; +package org.jboss.tools.vpe.browsersim.model; import java.util.List; import java.util.Observable; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListHolder.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListHolder.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.model; +package org.jboss.tools.vpe.browsersim.model; import java.util.Observable; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.model; +package org.jboss.tools.vpe.browsersim.model; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -23,15 +23,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.tools.browsersim.util.ResourcesUtil; +import org.jboss.tools.vpe.browsersim.util.ResourcesUtil; /** * @author Yahor Radtsevich (yradtsevich) */ public class DevicesListStorage { - private static final String DEFAULT_PREFERENCES_RESOURCE = "/org/jboss/tools/browsersim/resources/config/devices.cfg"; - private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.browsersim"; + private static final String DEFAULT_PREFERENCES_RESOURCE = "/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg"; + private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.vpe.browsersim"; private static final String USER_PREFERENCES_FILE = "devices.cfg"; public static void saveUserDefinedDevicesList(DevicesList devicesList) { Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.ui; +package org.jboss.tools.vpe.browsersim.ui; import java.net.URI; import java.net.URISyntaxException; @@ -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.vpe.browsersim.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.WebKitBrowserFactory; +import org.jboss.tools.vpe.browsersim.model.Device; +import org.jboss.tools.vpe.browsersim.model.DevicesList; +import org.jboss.tools.vpe.browsersim.model.DevicesListHolder; +import org.jboss.tools.vpe.browsersim.model.DevicesListStorage; +import org.jboss.tools.vpe.browsersim.util.ResourcesUtil; /** * @author Yahor Radtsevich (yradtsevich) @@ -247,11 +247,11 @@ } }); - final Image imageBack = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_backward.gif")); //$NON-NLS-1$ - final Image imageForward = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_forward.gif")); //$NON-NLS-1$ - final Image imageStop = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_stop.gif")); //$NON-NLS-1$ - final Image imageRefresh = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_refresh.gif")); //$NON-NLS-1$ - final Image imageGo = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_go.gif")); //$NON-NLS-1$ + final Image imageBack = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/vpe/browsersim/resources/icons/nav_backward.gif")); //$NON-NLS-1$ + final Image imageForward = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/vpe/browsersim/resources/icons/nav_forward.gif")); //$NON-NLS-1$ + final Image imageStop = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/vpe/browsersim/resources/icons/nav_stop.gif")); //$NON-NLS-1$ + final Image imageRefresh = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/vpe/browsersim/resources/icons/nav_refresh.gif")); //$NON-NLS-1$ + final Image imageGo = new Image(display, ResourcesUtil.getResourceAsStream("/org/jboss/tools/vpe/browsersim/resources/icons/nav_go.gif")); //$NON-NLS-1$ itemBack.setImage(imageBack); itemForward.setImage(imageForward); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,4 +1,4 @@ -package org.jboss.tools.browsersim.ui; +package org.jboss.tools.vpe.browsersim.ui; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.jboss.tools.browsersim.model.Device; +import org.jboss.tools.vpe.browsersim.model.Device; public class EditDeviceDialog extends Dialog { protected Device resultDevice; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.ui; +package org.jboss.tools.vpe.browsersim.ui; import java.util.ArrayList; import java.util.List; @@ -27,9 +27,9 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -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.vpe.browsersim.model.Device; +import org.jboss.tools.vpe.browsersim.model.DevicesList; +import org.jboss.tools.vpe.browsersim.model.DevicesListStorage; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,9 +8,9 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.ui; +package org.jboss.tools.vpe.browsersim.ui; -import org.jboss.tools.browsersim.util.NLS; +import org.jboss.tools.vpe.browsersim.util.NLS; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/NLS.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/util/NLS.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/NLS.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.util; +package org.jboss.tools.vpe.browsersim.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/ResourcesUtil.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/browsersim/util/ResourcesUtil.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/util/ResourcesUtil.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,11 +8,11 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.util; +package org.jboss.tools.vpe.browsersim.util; import java.io.InputStream; -import org.jboss.tools.browsersim.ui.BrowserSim; +import org.jboss.tools.vpe.browsersim.ui.BrowserSim; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/.project 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/.project 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.browsersim.browser</name> + <name>org.jboss.tools.vpe.browsersim.browser</name> <comment></comment> <projects> </projects> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebKit -Bundle-SymbolicName: org.jboss.tools.browsersim.browser;singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.browser;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-ExtensibleAPI: true -Export-Package: org.jboss.tools.browsersim.browser +Export-Package: org.jboss.tools.vpe.browsersim.browser Require-Bundle: org.eclipse.swt;bundle-version="3.7.0" Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/AbstractWebKitBrowser.java (from rev 36673, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/AbstractWebKitBrowser.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/AbstractWebKitBrowser.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/AbstractWebKitBrowser.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -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.vpe.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.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java (from rev 36673, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/PlatformUtil.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -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.vpe.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.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/WebKitBrowserFactory.java (from rev 36673, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/WebKitBrowserFactory.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/WebKitBrowserFactory.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/WebKitBrowserFactory.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -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.vpe.browsersim.browser; + +import org.eclipse.swt.SWTError; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.vpe.browsersim.browser.internal.WebKitBrowser_gtk_linux_x86; +import org.jboss.tools.vpe.browsersim.browser.internal.WebKitBrowser_gtk_linux_x86_64; +import org.jboss.tools.vpe.browsersim.browser.internal.WebKitBrowser_webkit_cocoa_macos; +import org.jboss.tools.vpe.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.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.browser.internal; +package org.jboss.tools.vpe.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.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.browser.internal; +package org.jboss.tools.vpe.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.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.browser.internal; +package org.jboss.tools.vpe.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.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/internal/WebKitBrowser_win32_win32_x86.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.browser.internal; +package org.jboss.tools.vpe.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.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.AbstractWebKitBrowser; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/.project 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/.project 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.browsersim.browser.test</name> + <name>org.jboss.tools.vpe.browsersim.browser.test</name> <comment></comment> <projects> </projects> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/META-INF/MANIFEST.MF 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/META-INF/MANIFEST.MF 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim WebKit Test -Bundle-SymbolicName: org.jboss.tools.browsersim.browser.test +Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.browser.test Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit, org.eclipse.swt, - org.jboss.tools.browsersim.browser;bundle-version="1.0.0" + org.jboss.tools.vpe.browsersim.browser;bundle-version="1.0.0" Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/BrowserAllTests.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/browsersim/browser/test/BrowserAllTests.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/BrowserAllTests.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,4 +1,4 @@ -package org.jboss.tools.browsersim.browser.test; +package org.jboss.tools.vpe.browsersim.browser.test; import junit.framework.Test; import junit.framework.TestSuite; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/WebKitTests.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/browsersim/browser/test/WebKitTests.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser.test/src/org/jboss/tools/vpe/browsersim/browser/test/WebKitTests.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.browser.test; +package org.jboss.tools.vpe.browsersim.browser.test; import junit.framework.TestCase; @@ -18,8 +18,8 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.jboss.tools.browsersim.browser.AbstractWebKitBrowser; -import org.jboss.tools.browsersim.browser.WebKitBrowserFactory; +import org.jboss.tools.vpe.browsersim.browser.AbstractWebKitBrowser; +import org.jboss.tools.vpe.browsersim.browser.WebKitBrowserFactory; /** * @author Yahor Radtsevich (yradtsevich) Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/.project 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/.project 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.browsersim.eclipse</name> + <name>org.jboss.tools.vpe.browsersim.eclipse</name> <comment></comment> <projects> </projects> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-25 19:55:09 UTC (rev 36675) @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim Eclipse Plug-in -Bundle-SymbolicName: org.jboss.tools.browsersim.eclipse; singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.eclipse;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.tools.browsersim.eclipse.Activator +Bundle-Activator: org.jboss.tools.vpe.browsersim.eclipse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.browsersim.browser;bundle-version="1.0.0", + org.jboss.tools.vpe.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.vpe.browsersim.eclipse/plugin.xml =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-11-25 19:11:50 UTC (rev 36674) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-11-25 19:55:09 UTC (rev 36675) @@ -5,25 +5,25 @@ point="org.eclipse.ui.commands"> <category name="BrowserSim" - id="org.jboss.tools.browsersim.eclipse.commands.category"> + id="org.jboss.tools.vpe.browsersim.eclipse.commands.category"> </category> <command name="Run BrowserSim" - categoryId="org.jboss.tools.browsersim.eclipse.commands.category" - id="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim"> + categoryId="org.jboss.tools.vpe.browsersim.eclipse.commands.category" + id="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim"> </command> </extension> <extension point="org.eclipse.ui.handlers"> <handler - commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim" - class="org.jboss.tools.browsersim.eclipse.handlers.RunBrowserSimHandler"> + commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim" + class="org.jboss.tools.vpe.browsersim.eclipse.handlers.RunBrowserSimHandler"> </handler> </extension> <extension point="org.eclipse.ui.bindings"> <key - commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim" + commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim" contextId="org.eclipse.ui.contexts.window" sequence="M1+6" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"> @@ -34,12 +34,12 @@ <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions"> <toolbar - id="org.jboss.tools.browsersim.eclipse.toolbars.sampleToolbar"> + id="org.jboss.tools.vpe.browsersim.eclipse.toolbars.sampleToolbar"> <command - commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim" + commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim" icon="icons/sample.gif" tooltip="Run BrowserSim" - id="org.jboss.tools.browsersim.eclipse.toolbars.runBrowserSim"> + id="org.jboss.tools.vpe.browsersim.eclipse.toolbars.runBrowserSim"> </command> </toolbar> </menuContribution> @@ -49,16 +49,16 @@ <editor extensions="html" icon="icons/sample.gif" - id="org.jboss.tools.browsersim.eclipse.editors.BrowserSimLauncher" - launcher="org.jboss.tools.browsersim.eclipse.editors.BrowserSimEditorLauncher" + id="org.jboss.tools.vpe.browsersim.eclipse.editors.BrowserSimLauncher" + launcher="org.jboss.tools.vpe.browsersim.eclipse.editors.BrowserSimEditorLauncher" name="BrowserSim"> </editor> </extension> <extension point="org.eclipse.ui.browser.browsers"> <browser executable="" - factoryclass="org.jboss.tools.browsersim.eclipse.BrowserSimFactory" - id="org.jboss.tools.browsersim.eclipse" + factoryclass="org.jboss.tools.vpe.browsersim.eclipse.BrowserSimFactory" + id="org.jboss.tools.vpe.browsersim.eclipse" name="BrowserSim" os="Win32,linux,MacOSX"> <location> Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/Activator.java (from rev 36673, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/Activator.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/Activator.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -0,0 +1,73 @@ +/******************************************************************************* + * 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.vpe.browsersim.eclipse; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + * + * @author "Yahor Radtsevich (yradtsevich)" + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.vpe.browsersim.eclipse"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/BrowserSimFactory.java (from rev 36673, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/BrowserSimFactory.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/BrowserSimFactory.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/BrowserSimFactory.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -0,0 +1,45 @@ +/******************************************************************************* + * 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.vpe.browsersim.eclipse; + +import java.net.URL; + +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.browser.BrowserFactory; +import org.eclipse.ui.browser.IWebBrowser; +import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher; + +/** + * Contribution to the {@code org.eclipse.ui.editors} extension point + * + * @author "Yahor Radtsevich (yradtsevich)" + */ +public class BrowserSimFactory extends BrowserFactory { + @Override + public IWebBrowser createBrowser(final String id, String location, + String parameters) { + return new IWebBrowser() { + @Override + public void openURL(URL url) throws PartInitException { + BrowserSimLauncher.launchBrowserSim(url.toString()); + } + @Override + public String getId() { + return id; + } + @Override + public boolean close() { + return false; + } + }; + } + +} Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/editors/BrowserSimEditorLauncher.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/BrowserSimEditorLauncher.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/editors/BrowserSimEditorLauncher.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -9,11 +9,11 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.eclipse.editors; +package org.jboss.tools.vpe.browsersim.eclipse.editors; import org.eclipse.core.runtime.IPath; import org.eclipse.ui.IEditorLauncher; -import org.jboss.tools.browsersim.eclipse.util.BrowserSimLauncher; +import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher; /** * @author "Yahor Radtsevich (yradtsevich)" Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/RunBrowserSimHandler.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,12 +8,12 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.eclipse.handlers; +package org.jboss.tools.vpe.browsersim.eclipse.handlers; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.jboss.tools.browsersim.eclipse.util.BrowserSimLauncher; +import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher; /** * @author "Yahor Radtsevich (yradtsevich)" Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-25 19:09:48 UTC (rev 36673) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-25 19:55:09 UTC (rev 36675) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.browsersim.eclipse.util; +package org.jboss.tools.vpe.browsersim.eclipse.util; import java.io.IOException; import java.io.InputStream; @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.ConfigurationScope; -import org.jboss.tools.browsersim.browser.PlatformUtil; +import org.jboss.tools.vpe.browsersim.browser.PlatformUtil; /** * @author "Yahor Radtsevich (yradtsevich)" @@ -26,8 +26,8 @@ public static void launchBrowserSim(String initialUrl) { String pathSeparator = System.getProperty("path.separator"); - String classPath = getBundleLocation("org.jboss.tools.browsersim") + "bin/" - + pathSeparator + getBundleLocation("org.jboss.tools.browsersim.browser") + "bin/" + String classPath = getBundleLocation("org.jboss.tools.vpe.browsersim") + "bin/" + + pathSeparator + getBundleLocation("org.jboss.tools.vpe.browsersim.browser") + "bin/" + pathSeparator + getBundleLocation("org.eclipse.swt") + pathSeparator + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM); String javaCommand = System.getProperty("java.home") + "/bin/java"; @@ -43,7 +43,7 @@ commandElements.add("-cp"); commandElements.add(classPath); - commandElements.add("org.jboss.tools.browsersim.ui.BrowserSim"); + commandElements.add("org.jboss.tools.vpe.browsersim.ui.BrowserSim"); if (initialUrl != null) { commandElements.add(initialUrl); }