JBoss Tools SVN: r36075 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-28 15:48:10 -0400 (Fri, 28 Oct 2011)
New Revision: 36075
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html
trunk/download.jboss.org/jbosstools/builds/cascade/index.html
trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
Log:
fix Hudson links
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html 2011-10-28 17:05:25 UTC (rev 36074)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html 2011-10-28 19:48:10 UTC (rev 36075)
@@ -9,7 +9,7 @@
</head>
<!--
s#_trunk#_stable_branch#g
- s#_Trunk#_Stable_Branch#g
+ s#_Trunk#_3.3.indigo#g
s#/trunk#/3.3_stable_branch#g
-->
<body>
@@ -36,41 +36,41 @@
<h2 class="title">Build Job Cascade:</h2>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.target-platform">Local
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.target-platform">Local
Target Platform build</a> (build + publish) <b>NOTE: same as trunk</b>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.contin...">Continuous
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.conti...">Continuous
build</a> (build only, no tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.tests">Tests
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.tests">Tests
build</a> (build + tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch/">All
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_3.3.indigo/">All
components' jobs, including JBT core + drools, teiid, pi4soa, savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch/portlet/da...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_3.3.indi...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.aggregate">Aggregate
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.aggre...">Aggregate
build</a> (collect components into a single update site for downstream use and publishing to sf.net)
</li>
</ul>
</ul>
<hr />
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.target-platform">Local
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.target-platform">Local
JBDS Target Platform build</a> (build + publish) <b>NOTE: same as trunk</b>
<ul>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_stable_branch.updatesite">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_stable_branch.update...">JBDS
Aggregate site build</a> (build Core [JBT + JBDS], Extras, Tech Preview
sites, then publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_stable_branch.product">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_stable_branch.product">JBDS
Product builds</a> (combine JBDS components + TP into installers,
publish)</li>
</ul>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/index.html 2011-10-28 17:05:25 UTC (rev 36074)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/index.html 2011-10-28 19:48:10 UTC (rev 36075)
@@ -36,40 +36,40 @@
<h2 class="title">Build Job Cascade:</h2>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.target...">Local
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.targe...">Local
Target Platform build</a> (build + publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.contin...">Continuous
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.conti...">Continuous
build</a> (build only, no tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.tests">Tests
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.tests">Tests
build</a> (build + tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch/">All
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">All
components' jobs, including JBT core + drools, teiid, pi4soa, savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch/portlet/da...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.aggregate">Aggregate
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.aggre...">Aggregate
build</a> (collect components into a single update site for downstream use and publishing to sf.net)</li>
</ul>
</ul>
<hr />
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.target-...">Local
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.target...">Local
JBDS Target Platform build</a> (build + publish)
<ul>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.updatesite">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.update...">JBDS
Aggregate site build</a> (build Core [JBT + JBDS], Extras, Tech Preview
sites, then publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.product">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-4.1_stable_branch.product">JBDS
Product builds</a> (combine JBDS components + TP into installers,
publish)</li>
</ul>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2011-10-28 17:05:25 UTC (rev 36074)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2011-10-28 19:48:10 UTC (rev 36075)
@@ -36,41 +36,41 @@
<h2 class="title">Build Job Cascade:</h2>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.target-platform">Local
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.target-platform">Local
Target Platform build</a> (build + publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.continuous">Continuous
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.continuous">Continuous
build</a> (build only, no tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.tests">Tests
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.tests">Tests
build</a> (build + tests, no publish)</li>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/">All
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/">All
components' jobs, including JBT core + drools, teiid, pi4soa, savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/portlet/dashboard_...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/po...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.aggregate">Aggregate
+ href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.aggregate">Aggregate
build</a> (collect components into a single update site for downstream use and publishing to sf.net)
</li>
</ul>
</ul>
<hr />
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.target-platform">Local
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.target-platform">Local
JBDS Target Platform build</a> (build + publish)
<ul>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.updatesite">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.updatesite">JBDS
Aggregate site build</a> (build Core [JBT + JBDS], Extras, Tech Preview
sites, then publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.product">JBDS
+ href="https://hudson.qa.jboss.com/hudson/job/devstudio-5.0_trunk.product">JBDS
Product builds</a> (combine JBDS components + TP into installers,
publish)</li>
</ul>
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36074 - in trunk: jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-10-28 13:05:25 -0400 (Fri, 28 Oct 2011)
New Revision: 36074
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-9930 OpenOns for ELs don't work in text nodes of JSP
Issue with EL detection in TEXT Regions is fixed. JUnit test is created.
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/JavaSource/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/JavaSource/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/JavaSource/resources.properties 2011-10-28 17:05:25 UTC (rev 36074)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello Hello1 Hello2 Hello3 Hello4 Hello5 Hello6 Hello7 Hello8 Hello9 Hello10 Hello11 Hello12 Hello13 Hello14 Hello15 Hello16 Hello17 Hello18 Hello19 Hello20 Hello21 Hello22 Hello23 Hello24 Hello25 Hello26 Hello27 Hello28 Hello29 Hello30 Hello31 Hello32 Hello33 Hello34 Hello35 Hello36 Hello37 Hello38 Hello39
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/JavaSource/resources.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp 2011-10-28 17:05:25 UTC (rev 36074)
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+#{msgs.greeting}
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/WEB-INF/faces-config.xml 2011-10-28 16:44:25 UTC (rev 36073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/WEB-INF/faces-config.xml 2011-10-28 17:05:25 UTC (rev 36074)
@@ -122,4 +122,10 @@
<to-view-id>/page3.jsp</to-view-id>
</navigation-case>
</navigation-rule>
+ <application>
+ <resource-bundle>
+ <base-name>resources</base-name>
+ <var>msgs</var>
+ </resource-bundle>
+ </application>
</faces-config>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2011-10-28 16:44:25 UTC (rev 36073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2011-10-28 17:05:25 UTC (rev 36074)
@@ -29,15 +29,24 @@
import org.jboss.tools.test.util.WorkbenchUtils;
/**
- * The JUnit test cases for JBIDE-5385 issue
+ * The JUnit test cases for JBIDE-5385, JBIDE-9930 issues
*
* @author Victor Rubezhny
*/
public class JSPELHyperlinkTestForELInTagBodyTest extends TestCase {
private static final String PROJECT_NAME = "jsfHyperlinkTests";
- private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/JBIDE-9930/elInTagBody.jsp";
- private static final String[] TEXT_TO_FIND = new String [] {"bean1", "bean1.property1"};
- private static final String[] RESULT_EDITORS = new String [] {"Bean1.java", "Bean1.java"};
+ private static final String[] PAGE_NAMES = new String[] {
+ PROJECT_NAME+"/WebContent/JBIDE-9930/elInTagBody.jsp",
+ PROJECT_NAME+"/WebContent/JBIDE-9930/anotherELInTagBody.jsp",
+ };
+ private static final String[][] TEXT_TO_FIND = new String [][] {
+ {"bean1", "bean1.property1"},
+ {"msgs", "msgs.greeting"}
+ };
+ private static final String[][] RESULT_EDITORS = new String [][] {
+ {"Bean1.java", "Bean1.java"},
+ {"resources.properties", "resources.properties"}
+ };
public IProject project = null;
public String naturesCheckProperty;
@@ -64,20 +73,22 @@
public void testJSPELHyperlinkTestForELInTagBody() throws PartInitException, BadLocationException {
try {
- for (int i = 0; i < TEXT_TO_FIND.length; i++) {
- doJSPELHyperlinkTestForELInTagBodyTest(TEXT_TO_FIND[i], RESULT_EDITORS[i]);
+ for (int i = 0; i < PAGE_NAMES.length; i++) {
+ for (int j = 0; j < TEXT_TO_FIND.length; j++) {
+ doJSPELHyperlinkTestForELInTagBodyTest(PAGE_NAMES[i], TEXT_TO_FIND[i][j], RESULT_EDITORS[i][j]);
+ }
}
} finally {
WorkbenchUtils.closeAllEditors();
}
}
- private void doJSPELHyperlinkTestForELInTagBodyTest(String template, String editorName) throws BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ private void doJSPELHyperlinkTestForELInTagBodyTest(String pageName, String template, String editorName) throws BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(pageName);
assertTrue(editor instanceof JSPMultiPageEditor);
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
- assertNotNull("Viewer couldn't be found for " + PAGE_NAME, viewer);
+ assertNotNull("Viewer couldn't be found for " + pageName, viewer);
IDocument document = viewer.getDocument();
IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
template, true, true, false, false);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-10-28 16:44:25 UTC (rev 36073)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-10-28 17:05:25 UTC (rev 36074)
@@ -480,10 +480,10 @@
}
private static void fillElReferencesForNode(IDocument document, IDOMNode node, XmlContextImpl context) {
- if(Node.ELEMENT_NODE == node.getNodeType() || Node.TEXT_NODE == node.getNodeType()) {
- IStructuredDocumentRegion regionNode = node.getFirstStructuredDocumentRegion();
- if (regionNode == null) return;
-
+ IStructuredDocumentRegion regionNode = node.getFirstStructuredDocumentRegion();
+ if (regionNode == null) return;
+
+ if(Node.ELEMENT_NODE == node.getNodeType()) {
ITextRegionList regions = regionNode.getRegions();
if (regions == null) return;
@@ -492,6 +492,20 @@
fillElReferencesForRegionNode(document, node, regionNode, region, context);
}
}
+ } else if (Node.TEXT_NODE == node.getNodeType()) {
+ IStructuredDocumentRegion lastRegionNode = node.getLastStructuredDocumentRegion();
+ while (regionNode != null) {
+ ITextRegionList regions = regionNode.getRegions();
+ if (regions == null) return;
+
+ for (ITextRegion region : regions.toArray()) {
+ if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == region.getType() || DOMRegionContext.XML_CONTENT == region.getType()) {
+ fillElReferencesForRegionNode(document, node, regionNode, region, context);
+ }
+ }
+ if (regionNode == lastRegionNode) break;
+ regionNode = regionNode.getNext();
+ }
}
}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36073 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-28 12:44:25 -0400 (Fri, 28 Oct 2011)
New Revision: 36073
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added automatic selection of WebKitBrowser implementation using system properties
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java 2011-10-28 15:33:49 UTC (rev 36072)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java 2011-10-28 16:44:25 UTC (rev 36073)
@@ -11,13 +11,40 @@
package org.jboss.tools.browsersim.webkit;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_gtk_linux_x86;
+import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_gtk_linux_x86_64;
+import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_webkit_cocoa_macos;
import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_win32_win32_x86;
/**
* @author "Yahor Radtsevich (yradtsevich)"
*/
public class WebKitBrowserFactory {
+ private static final String CURRENT_PLATFORM;
+ static {
+
+ String ws = System.getProperty("osgi.ws");
+ System.out.println(ws);
+ ws = (ws == null) ? "" : ws;
+ String os = System.getProperty("osgi.os");
+ os = (os == null) ? "" : os;
+ String arch = System.getProperty("osgi.arch");
+ arch = (arch == null) ? "" : arch;
+
+ CURRENT_PLATFORM = ws + '.' + os + ("macosx".equals(os) ? "" : '.' + arch);
+ }
+
public static AbstractWebKitBrowser createWebKitBrowser(Composite parent, int style) {
- return new WebKitBrowser_win32_win32_x86(parent, style);
+ if (CURRENT_PLATFORM.equals("gtl.linux.x86")) {
+ return new WebKitBrowser_gtk_linux_x86(parent, style);
+ } else if (CURRENT_PLATFORM.equals("gtl.linux.x86_64")) {
+ return new WebKitBrowser_gtk_linux_x86_64(parent, style);
+ } else if (CURRENT_PLATFORM.equals("cocoa.macosx")) {
+ return new WebKitBrowser_webkit_cocoa_macos(parent, style);
+ } else if (CURRENT_PLATFORM.equals("win32.win32.x86")) {
+ return new WebKitBrowser_win32_win32_x86(parent, style);
+ }
+
+ return null;
}
}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36072 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-28 11:33:49 -0400 (Fri, 28 Oct 2011)
New Revision: 36072
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- removing fragments and gathering all classes in one plugin is in progress: MacOS X Cocoa version
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-10-28 15:14:27 UTC (rev 36071)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-10-28 15:33:49 UTC (rev 36072)
@@ -15,7 +15,6 @@
import java.lang.reflect.Method;
import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.cocoa.NSString;
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
@@ -37,12 +36,15 @@
Field webViewField = webKit.getClass().getDeclaredField("webView");
webViewField.setAccessible(true);
Object webView = webViewField.get(webKit);
- Method setCustomUserAgent = webView.getClass().getDeclaredMethod("setCustomUserAgent", NSString.class);
+ Class<?> NSString = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.cocoa.NSString");
+ Method setCustomUserAgent = webView.getClass().getDeclaredMethod("setCustomUserAgent", NSString);
if (userAgent == null) {
setCustomUserAgent.invoke(webView, null);
} else {
- setCustomUserAgent.invoke(webView, NSString.stringWith(userAgent));
+ Method NSString_stringWith = NSString.getDeclaredMethod("stringWith", String.class);
+ //setCustomUserAgent.invoke(webView, org.eclipse.swt.internal.cocoa.NSString.stringWith(userAgent));
+ setCustomUserAgent.invoke(webView, NSString_stringWith.invoke(null, userAgent));
}
} catch (SecurityException e) {
e.printStackTrace();
@@ -56,6 +58,8 @@
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
}
}
}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36071 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-28 11:14:27 -0400 (Fri, 28 Oct 2011)
New Revision: 36071
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- removing fragments and gathering all classes in one plugin is in progress: Linux x86 version
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-10-28 14:40:43 UTC (rev 36070)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-10-28 15:14:27 UTC (rev 36071)
@@ -15,8 +15,6 @@
import java.lang.reflect.Method;
import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.Converter;
-import org.eclipse.swt.internal.gtk.OS;
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
@@ -41,24 +39,20 @@
protected void setCustomUserAgent(String userAgent) {
try {
- Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
- webBrowserField.setAccessible(true);
- Object webKit = webBrowserField.get(this);
-
- Field webViewField = webKit.getClass().getDeclaredField("webView");
- webViewField.setAccessible(true);
- int webView = (Integer) webViewField.get(webKit);
+ int /*long*/ webView = getThis_webBrowser_webView();
-// int settings = WebKitGTK.webkit_web_view_get_settings(webView);
- Class webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
- Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", int.class);
- int settings = (Integer) webkit_web_view_get_settingsMethod.invoke(null, webView);
+ //int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings(webView);
+ int /*long*/ settings = invokeWebKitGTK_webkit_web_view_get_settings(webView);
if (userAgent == null) {
- OS.g_object_set(settings, USER_AGENT, 0, 0);
+ //org.eclipse.swt.internal.gtk.OS.g_object_set(settings, USER_AGENT, 0, 0);
+ invokeOS_g_object_set(settings, USER_AGENT, 0, 0);
} else {
- byte[] bytes = Converter.wcsToMbcs(null, userAgent, true);
- OS.g_object_set(settings, USER_AGENT, bytes, 0);
+ //byte[] bytes = org.eclipse.swt.internal.Converter.wcsToMbcs(null, userAgent, true);
+ byte[] bytes = invokeConverter_wcsToMbcs(null, userAgent, true);
+
+ //org.eclipse.swt.internal.gtk.OS.g_object_set(settings, USER_AGENT, bytes, 0);
+ invokeOS_g_object_set(settings, USER_AGENT, bytes, 0);
}
} catch (SecurityException e) {
e.printStackTrace();
@@ -76,4 +70,52 @@
e.printStackTrace();
}
}
+
+ private int /*long*/ getThis_webBrowser_webView() throws NoSuchFieldException,
+ IllegalAccessException {
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ int /*long*/ webView = (Integer /*Long*/) webViewField.get(webKit);
+ return webView;
+ }
+
+ //void org.eclipse.swt.internal.gtk.OS#g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator)
+ private void invokeOS_g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> OS = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.gtk.OS");
+ Method OS_g_object_set = OS.getDeclaredMethod("g_object_set", int/*long*/.class, byte[].class, int.class, int/*long*/.class);
+ OS_g_object_set.invoke(null, object, first_property_name, data, terminator);
+ }
+
+ //void org.eclipse.swt.internal.gtk.OS#void g_object_set(int /*long*/ object, byte[] first_property_name, byte[] data, int /*long*/ terminator)
+ private void invokeOS_g_object_set(int /*long*/ object, byte[] first_property_name, byte[] data, int /*long*/ terminator)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> OS = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.gtk.OS");
+ Method OS_g_object_set = OS.getDeclaredMethod("g_object_set", int/*long*/.class, byte[].class, byte[].class, int/*long*/.class);
+ OS_g_object_set.invoke(null, object, first_property_name, data, terminator);
+ }
+
+ // public static byte [] org.eclipse.swt.internal.Converter#wcsToMbcs (String codePage, String string, boolean terminate)
+ private byte [] invokeConverter_wcsToMbcs (String codePage, String string, boolean terminate)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> Converter = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.Converter");
+ Method Converter_wcsToMbcs = Converter.getDeclaredMethod("wcsToMbcs", String.class, String.class, boolean.class);
+ return (byte[]) Converter_wcsToMbcs.invoke(null, codePage, string, terminate);
+ }
+
+ // org.eclipse.swt.internal.webkit.WebKitGTK#webkit_web_view_get_settings(webView);
+ private int /*long*/ invokeWebKitGTK_webkit_web_view_get_settings(int /*long*/ webView)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
+ Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", int/*long*/.class);
+ return (Integer/*Long*/) webkit_web_view_get_settingsMethod.invoke(null, webView);
+ }
}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36070 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim/META-INF and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-28 10:40:43 -0400 (Fri, 28 Oct 2011)
New Revision: 36070
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/plugin.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_win32_win32_x86.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_backward.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_forward.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_go.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_home.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_print.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_refresh.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_stop.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/synced.gif
Removed:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF
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/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- removing fragments and gathering all classes in one plugin is in progress
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-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF 2011-10-28 14:40:43 UTC (rev 36070)
@@ -4,8 +4,6 @@
Bundle-SymbolicName: org.jboss.tools.browsersim;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
- org.jboss.tools.browsersim.webkit;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.7.0"
+ org.jboss.tools.browsersim.webkit;bundle-version="1.0.0"
+Export-Package: org.jboss.tools.browsersim
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,10 +0,0 @@
-<plugin>
- <extension id="application"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.jboss.tools.browsersim.Application">
- </run>
- </application>
- </extension>
-</plugin>
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class Activator implements BundleActivator {
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- // new BrowserSim(new Display()).run();
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- }
-
-}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class Application implements IApplication {
-
- @Override
- public Object start(IApplicationContext context) throws Exception {
- Display display = PlatformUI.createDisplay();
- new BrowserSim(display).run();
- return IApplication.EXIT_OK;
- }
-
- @Override
- public void stop() {
- // TODO Auto-generated method stub
-
- }
-
-}
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.browsersim;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -44,13 +42,14 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
-import org.jboss.tools.browsersim.webkit.WebKitBrowser;
+import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
+import org.jboss.tools.browsersim.webkit.WebKitBrowserFactory;
/**
* @author Yahor Radtsevich (yradtsevich)
*/
public class BrowserSim implements Runnable {
- private WebKitBrowser browser;
+ private AbstractWebKitBrowser browser;
private Display display;
private Shell shell;
private Text locationText;
@@ -96,7 +95,7 @@
locationText.setLayoutData(data);
try {
- browser = new WebKitBrowser(shell, SWT.NONE);
+ browser = WebKitBrowserFactory.createWebKitBrowser(shell, SWT.NONE);
} catch (SWTError e) {
System.out.println("Could not instantiate Browser: " + e.getMessage());
display.dispose();
@@ -208,11 +207,11 @@
}
});
- final Image imageBack = new Image(display, getResourceAsStream("resources/icons/nav_backward.gif"));
- final Image imageForward = new Image(display, getResourceAsStream("resources/icons/nav_forward.gif"));
- final Image imageStop = new Image(display, getResourceAsStream("resources/icons/nav_stop.gif"));
- final Image imageRefresh = new Image(display, getResourceAsStream("resources/icons/nav_refresh.gif"));
- final Image imageGo = new Image(display, getResourceAsStream("resources/icons/nav_go.gif"));
+ final Image imageBack = new Image(display, getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_backward.gif"));
+ final Image imageForward = new Image(display, getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_forward.gif"));
+ final Image imageStop = new Image(display, getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_stop.gif"));
+ final Image imageRefresh = new Image(display, getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_refresh.gif"));
+ final Image imageGo = new Image(display, getResourceAsStream("/org/jboss/tools/browsersim/resources/icons/nav_go.gif"));
itemBack.setImage(imageBack);
itemForward.setImage(imageForward);
@@ -236,14 +235,6 @@
}
private InputStream getResourceAsStream(String name) {
- if (true) {
- try {
- return new FileInputStream(name);
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
return this.getClass().getResourceAsStream(name);
}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_backward.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_backward.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_forward.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_forward.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_go.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_go.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_home.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_home.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_print.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_print.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_refresh.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_refresh.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/nav_stop.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/nav_stop.gif)
===================================================================
(Binary files differ)
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/icons/synced.gif (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/resources/icons/synced.gif)
===================================================================
(Binary files differ)
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF 2011-10-28 14:40:43 UTC (rev 36070)
@@ -3,8 +3,6 @@
Bundle-Name: BrowserSim Application
Bundle-SymbolicName: org.jboss.tools.browsersim.application;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.browsersim.application.Activator
-Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/plugin.xml (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/plugin.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/plugin.xml 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,10 @@
+<plugin>
+ <extension id="application"
+ point="org.eclipse.core.runtime.applications">
+ <application>
+ <run
+ class="org.jboss.tools.browsersim.application.Application">
+ </run>
+ </application>
+ </extension>
+</plugin>
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -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.application;
+
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.browsersim.BrowserSim;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class Application implements IApplication {
+
+ @Override
+ public Object start(IApplicationContext context) throws Exception {
+ Display display = PlatformUI.createDisplay();
+ new BrowserSim(display).run();
+ return IApplication.EXIT_OK;
+ }
+
+ @Override
+ public void stop() {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.webkit;
+
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_win32_win32_x86;
+
+/**
+ * @author "Yahor Radtsevich (yradtsevich)"
+ */
+public class WebKitBrowserFactory {
+ public static AbstractWebKitBrowser createWebKitBrowser(Composite parent, int style) {
+ return new WebKitBrowser_win32_win32_x86(parent, style);
+ }
+}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * 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.webkit.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.internal.Converter;
+import org.eclipse.swt.internal.gtk.OS;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class WebKitBrowser_gtk_linux_x86 extends AbstractWebKitBrowser {
+ private static final byte[] USER_AGENT; // = WebKitGTK.user_agent
+ static {
+ int length = "user-agent".length();
+ char [] chars = new char[length];
+ "user-agent".getChars(0, length, chars, 0);
+ USER_AGENT = new byte[length + 1];
+ for (int i = 0; i < length; i++) {
+ USER_AGENT[i] = (byte) chars [i];
+ }
+ }
+
+ public WebKitBrowser_gtk_linux_x86(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ protected void setCustomUserAgent(String userAgent) {
+ try {
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ int webView = (Integer) webViewField.get(webKit);
+
+// int settings = WebKitGTK.webkit_web_view_get_settings(webView);
+ Class webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
+ Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", int.class);
+ int settings = (Integer) webkit_web_view_get_settingsMethod.invoke(null, webView);
+
+ if (userAgent == null) {
+ OS.g_object_set(settings, USER_AGENT, 0, 0);
+ } else {
+ byte[] bytes = Converter.wcsToMbcs(null, userAgent, true);
+ OS.g_object_set(settings, USER_AGENT, bytes, 0);
+ }
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * 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.webkit.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class WebKitBrowser_gtk_linux_x86_64 extends AbstractWebKitBrowser {
+ private static final byte[] USER_AGENT; // = WebKitGTK.user_agent
+ static {
+ int length = "user-agent".length();
+ char [] chars = new char[length];
+ "user-agent".getChars(0, length, chars, 0);
+ USER_AGENT = new byte[length + 1];
+ for (int i = 0; i < length; i++) {
+ USER_AGENT[i] = (byte) chars [i];
+ }
+ }
+
+ public WebKitBrowser_gtk_linux_x86_64(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ protected void setCustomUserAgent(String userAgent) {
+ try {
+ long webView = getThis_webBrowser_webView();
+
+ //long settings = WebKitGTK.webkit_web_view_get_settings(webView);
+ long settings = invokeWebKitGTK_webkit_web_view_get_settings(webView);
+
+ if (userAgent == null) {
+ //org.eclipse.swt.internal.gtk.OS.g_object_set(settings, USER_AGENT, 0, 0);
+ invokeOS_g_object_set(settings, USER_AGENT, 0, 0);
+ } else {
+ //byte[] bytes = org.eclipse.swt.internal.Converter.wcsToMbcs(null, userAgent, true);
+ byte[] bytes = invokeConverter_wcsToMbcs(null, userAgent, true);
+
+ //org.eclipse.swt.internal.gtk.OS.g_object_set(settings, USER_AGENT, bytes, 0);
+ invokeOS_g_object_set(settings, USER_AGENT, bytes, 0);
+ }
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private long getThis_webBrowser_webView() throws NoSuchFieldException,
+ IllegalAccessException {
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ long webView = (Long) webViewField.get(webKit);
+ return webView;
+ }
+
+ //void org.eclipse.swt.internal.gtk.OS#g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator)
+ private void invokeOS_g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> OS = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.gtk.OS");
+ Method OS_g_object_set = OS.getDeclaredMethod("g_object_set", long.class, byte[].class, int.class, long.class);
+ OS_g_object_set.invoke(null, object, first_property_name, data, terminator);
+ }
+
+ //void org.eclipse.swt.internal.gtk.OS#void g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator)
+ private void invokeOS_g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> OS = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.gtk.OS");
+ Method OS_g_object_set = OS.getDeclaredMethod("g_object_set", long.class, byte[].class, byte[].class, long.class);
+ OS_g_object_set.invoke(null, object, first_property_name, data, terminator);
+ }
+
+ // public static byte [] org.eclipse.swt.internal.Converter#wcsToMbcs (String codePage, String string, boolean terminate)
+ private byte [] invokeConverter_wcsToMbcs (String codePage, String string, boolean terminate)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> Converter = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.Converter");
+ Method Converter_wcsToMbcs = Converter.getDeclaredMethod("wcsToMbcs", String.class, String.class, boolean.class);
+ return (byte[]) Converter_wcsToMbcs.invoke(null, codePage, string, terminate);
+ }
+
+ // org.eclipse.swt.internal.webkit.WebKitGTK#webkit_web_view_get_settings(webView);
+ private long invokeWebKitGTK_webkit_web_view_get_settings(long /*int*/ webView)
+ throws ClassNotFoundException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ Class<?> webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
+ Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", long.class);
+ return (Long) webkit_web_view_get_settingsMethod.invoke(null, webView);
+ }
+}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_webkit_cocoa_macos.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * 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.webkit.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.internal.cocoa.NSString;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class WebKitBrowser_webkit_cocoa_macos extends AbstractWebKitBrowser {
+
+ public WebKitBrowser_webkit_cocoa_macos(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ protected void setCustomUserAgent(String userAgent) {
+ try {
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ Object webView = webViewField.get(webKit);
+ Method setCustomUserAgent = webView.getClass().getDeclaredMethod("setCustomUserAgent", NSString.class);
+
+ if (userAgent == null) {
+ setCustomUserAgent.invoke(webView, null);
+ } else {
+ setCustomUserAgent.invoke(webView, NSString.stringWith(userAgent));
+ }
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_win32_win32_x86.java (from rev 36067, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_win32_win32_x86.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_win32_win32_x86.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * 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.webkit.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class WebKitBrowser_win32_win32_x86 extends AbstractWebKitBrowser {
+ public WebKitBrowser_win32_win32_x86(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ protected void setCustomUserAgent(String userAgent) {
+ try {
+ int userAgentValue;
+
+ if (userAgent != null) {
+ char[] data = (userAgent + '\0').toCharArray ();
+
+ //userAgentValue = org.eclipse.swt.internal.ole.win32.COM.SysAllocString(data);
+ userAgentValue = invokeCOM_SysAllocString(data);
+ } else {
+ userAgentValue = 0;
+ }
+
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ Object webView = webViewField.get(webKit);
+
+ Method setCustomUserAgentMethod = webView.getClass().getDeclaredMethod("setCustomUserAgent", int.class);
+ setCustomUserAgentMethod.invoke(webView, userAgentValue);
+
+ if (userAgent != null) {
+ //org.eclipse.swt.internal.ole.win32.COM.SysFreeString(userAgentValue);
+ invokeCOM_SysFreeString(userAgentValue);
+ }
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Invokes {@link org.eclipse.swt.internal.ole.win32.COM#SysAllocString(char[])}.
+ */
+ private int /*long*/ invokeCOM_SysAllocString(char [] sz) throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+ Class<?> COM = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.ole.win32.COM");
+ Method COM_SysAllocString = COM.getDeclaredMethod("SysAllocString", char[].class);
+ return (Integer) COM_SysAllocString.invoke(null, sz);
+ }
+
+ /**
+ * Invokes {@link org.eclipse.swt.internal.ole.win32.COM#SysFreeString(int)}.
+ */
+ private void invokeCOM_SysFreeString(int /*long*/ bstr) throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+ Class<?> COM = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.ole.win32.COM");
+ Method COM_SysFreeString = COM.getDeclaredMethod("SysFreeString", int.class /*long.class*/);
+ COM_SysFreeString.invoke(null, bstr);
+ }
+}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * 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.webkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.cocoa.NSString;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class WebKitBrowser extends AbstractWebKitBrowser {
-
- public WebKitBrowser(Composite parent, int style) {
- super(parent, style);
- }
-
- protected void setCustomUserAgent(String userAgent) {
- try {
- Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
- webBrowserField.setAccessible(true);
- Object webKit = webBrowserField.get(this);
-
- Field webViewField = webKit.getClass().getDeclaredField("webView");
- webViewField.setAccessible(true);
- Object webView = webViewField.get(webKit);
- Method setCustomUserAgent = webView.getClass().getDeclaredMethod("setCustomUserAgent", NSString.class);
-
- if (userAgent == null) {
- setCustomUserAgent.invoke(webView, null);
- } else {
- setCustomUserAgent.invoke(webView, NSString.stringWith(userAgent));
- }
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * 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.webkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.Converter;
-import org.eclipse.swt.internal.gtk.OS;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class WebKitBrowser extends AbstractWebKitBrowser {
- private static final byte[] USER_AGENT; // = WebKitGTK.user_agent
- static {
- int length = "user-agent".length();
- char [] chars = new char[length];
- "user-agent".getChars(0, length, chars, 0);
- USER_AGENT = new byte[length + 1];
- for (int i = 0; i < length; i++) {
- USER_AGENT[i] = (byte) chars [i];
- }
- }
-
- public WebKitBrowser(Composite parent, int style) {
- super(parent, style);
- }
-
- protected void setCustomUserAgent(String userAgent) {
- try {
- Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
- webBrowserField.setAccessible(true);
- Object webKit = webBrowserField.get(this);
-
- Field webViewField = webKit.getClass().getDeclaredField("webView");
- webViewField.setAccessible(true);
- int webView = (Integer) webViewField.get(webKit);
-
-// int settings = WebKitGTK.webkit_web_view_get_settings(webView);
- Class webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
- Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", int.class);
- int settings = (Integer) webkit_web_view_get_settingsMethod.invoke(null, webView);
-
- if (userAgent == null) {
- OS.g_object_set(settings, USER_AGENT, 0, 0);
- } else {
- byte[] bytes = Converter.wcsToMbcs(null, userAgent, true);
- OS.g_object_set(settings, USER_AGENT, bytes, 0);
- }
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * 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.webkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.Converter;
-import org.eclipse.swt.internal.gtk.OS;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class WebKitBrowser extends AbstractWebKitBrowser {
- private static final byte[] USER_AGENT; // = WebKitGTK.user_agent
- static {
- int length = "user-agent".length();
- char [] chars = new char[length];
- "user-agent".getChars(0, length, chars, 0);
- USER_AGENT = new byte[length + 1];
- for (int i = 0; i < length; i++) {
- USER_AGENT[i] = (byte) chars [i];
- }
- }
-
- public WebKitBrowser(Composite parent, int style) {
- super(parent, style);
- }
-
- protected void setCustomUserAgent(String userAgent) {
- try {
- Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
- webBrowserField.setAccessible(true);
- Object webKit = webBrowserField.get(this);
-
- Field webViewField = webKit.getClass().getDeclaredField("webView");
- webViewField.setAccessible(true);
- long webView = (Long) webViewField.get(webKit);
-
-// long settings = WebKitGTK.webkit_web_view_get_settings(webView);
- Class webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
- Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", long.class);
- long settings = (Long) webkit_web_view_get_settingsMethod.invoke(null, webView);
-
- if (userAgent == null) {
- OS.g_object_set(settings, USER_AGENT, 0, 0);
- } else {
- byte[] bytes = Converter.wcsToMbcs(null, userAgent, true);
- OS.g_object_set(settings, USER_AGENT, bytes, 0);
- }
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 13:39:25 UTC (rev 36069)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-28 14:40:43 UTC (rev 36070)
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * 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.webkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.internal.ole.win32.COM;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class WebKitBrowser extends AbstractWebKitBrowser {
- public WebKitBrowser(Composite parent, int style) {
- super(parent, style);
- }
-
- protected void setCustomUserAgent(String userAgent) {
- int userAgentValue;
- if (userAgent != null) {
- char[] data = (userAgent + '\0').toCharArray ();
- userAgentValue = COM.SysAllocString(data);
- } else {
- userAgentValue = 0;
- }
-
- try {
- Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
- webBrowserField.setAccessible(true);
- Object webKit = webBrowserField.get(this);
-
- Field webViewField = webKit.getClass().getDeclaredField("webView");
- webViewField.setAccessible(true);
- Object webView = webViewField.get(webKit);
-
- Method setCustomUserAgentMethod = webView.getClass().getDeclaredMethod("setCustomUserAgent", int.class);
- setCustomUserAgentMethod.invoke(webView, userAgentValue);
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- if (userAgent != null) {
- COM.SysFreeString(userAgentValue);
- }
- }
-}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36069 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-10-28 09:39:25 -0400 (Fri, 28 Oct 2011)
New Revision: 36069
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://issues.jboss.org/browse/JBIDE-9417 - Comment was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-10-28 12:27:08 UTC (rev 36068)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-10-28 13:39:25 UTC (rev 36069)
@@ -488,8 +488,10 @@
} else {
/*
* https://issues.jboss.org/browse/JBIDE-9417
- * Template has no children, but should add
- * any additional children from childrenInfoList
+ * Template has no children, but could add
+ * any additional children from childrenInfoList.
+ * Implies that templates that should have no children
+ * also should have null or empty childrenInfoList.
*/
if (childrenInfoList != null) {
addChildren(template, sourceNode, visualOldContainer, childrenInfoList);
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36068 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim.application and 18 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-28 08:27:08 -0400 (Fri, 28 Oct 2011)
New Revision: 36068
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.classpath
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.project
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.jdt.core.prefs
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.pde.core.prefs
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/build.properties
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.classpath
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.project
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.settings/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.settings/org.eclipse.jdt.core.prefs
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/
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/build.properties
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/icons/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/icons/sample.gif
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- created org.jboss.tools.browsersim.application plugin for running of BrowserSim as a RCP application
- created plugin org.jboss.tools.browsersim.eclipse plugin for running of BrowserSim from Eclipse
Property changes on: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application
___________________________________________________________________
Added: svn:ignore
+ bin
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.classpath
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.classpath (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.classpath 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.project
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.project (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.project 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.browsersim.application</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.jdt.core.prefs 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,8 @@
+#Thu Oct 27 22:42:57 EEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.pde.core.prefs
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.pde.core.prefs (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/.settings/org.eclipse.pde.core.prefs 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,4 @@
+#Thu Oct 27 22:42:57 EEST 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/META-INF/MANIFEST.MF 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: BrowserSim Application
+Bundle-SymbolicName: org.jboss.tools.browsersim.application;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.browsersim.application.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.osgi.framework;version="1.3.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.jboss.tools.browsersim;bundle-version="1.0.0"
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/build.properties
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/build.properties (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/build.properties 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse
___________________________________________________________________
Added: svn:ignore
+ bin
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.classpath
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.classpath (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.classpath 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.project
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.project (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.project 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.browsersim.eclipse</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/.settings/org.eclipse.jdt.core.prefs 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,8 @@
+#Thu Oct 27 22:16:57 EEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: 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 (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: BrowserSim Eclipse Plug-in
+Bundle-SymbolicName: org.jboss.tools.browsersim.eclipse; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.browsersim.eclipse.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/build.properties
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/build.properties (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/build.properties 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+ META-INF/,\
+ .,\
+ icons/
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/icons/sample.gif
===================================================================
(Binary files differ)
Property changes on: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/icons/sample.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="Sample Category"
+ id="org.jboss.tools.browsersim.eclipse.commands.category">
+ </category>
+ <command
+ name="Sample Command"
+ categoryId="org.jboss.tools.browsersim.eclipse.commands.category"
+ id="org.jboss.tools.browsersim.eclipse.commands.sampleCommand">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ class="org.jboss.tools.browsersim.eclipse.handlers.SampleHandler">
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ contextId="org.eclipse.ui.contexts.window"
+ sequence="M1+6"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </key>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+ <menu
+ label="Sample Menu"
+ mnemonic="M"
+ id="org.jboss.tools.browsersim.eclipse.menus.sampleMenu">
+ <command
+ commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ mnemonic="S"
+ id="org.jboss.tools.browsersim.eclipse.menus.sampleCommand">
+ </command>
+ </menu>
+ </menuContribution>
+ <menuContribution
+ locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+ <toolbar
+ id="org.jboss.tools.browsersim.eclipse.toolbars.sampleToolbar">
+ <command
+ commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ icon="icons/sample.gif"
+ tooltip="Say hello world"
+ id="org.jboss.tools.browsersim.eclipse.toolbars.sampleCommand">
+ </command>
+ </toolbar>
+ </menuContribution>
+ </extension>
+
+</plugin>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,61 @@
+package org.jboss.tools.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
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.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);
+ }
+}
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java 2011-10-28 12:27:08 UTC (rev 36068)
@@ -0,0 +1,47 @@
+package org.jboss.tools.browsersim.eclipse.handlers;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.jface.dialogs.MessageDialog;
+
+/**
+ * Our sample handler extends AbstractHandler, an IHandler base class.
+ * @see org.eclipse.core.commands.IHandler
+ * @see org.eclipse.core.commands.AbstractHandler
+ */
+public class SampleHandler extends AbstractHandler {
+ /**
+ * The constructor.
+ */
+ public SampleHandler() {
+ }
+
+ /**
+ * the command has been executed, so extract extract the needed information
+ * from the application context.
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ try {
+ System.out.println(new URL(Platform.getBundle("org.eclipse.swt").getLocation()));
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
+ MessageDialog.openInformation(
+ window.getShell(),
+ "BrowserSim Eclipse Plug-in",
+ "Hello, Eclipse world");
+ return null;
+ }
+}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36067 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: openon and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-10-28 07:19:44 -0400 (Fri, 28 Oct 2011)
New Revision: 36067
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
Log:
CDI bot tests correction against 5.0.0M4
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-10-28 11:19:44 UTC (rev 36067)
@@ -48,7 +48,7 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- CDIPerspectiveTest.class,
+ //CDIPerspectiveTest.class,
CDIATWizardTest.class,
BeansEditorTest.class,
CDIQuickFixTest.class,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-10-28 11:19:44 UTC (rev 36067)
@@ -42,7 +42,7 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- CDIPerspectiveTest.class,
+ //CDIPerspectiveTest.class,
CDIATWizardTest.class,
})
public class CDISmokeBotTests extends CDIBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-10-28 11:19:44 UTC (rev 36067)
@@ -66,7 +66,7 @@
public void waitForJobs() {
util.waitForNonIgnoredJobs();
}
-
+
@Test
public void testBeanInjectOpenOn() {
@@ -103,7 +103,7 @@
bot.editorByTitle("beans.xml").show();
bot.cTabItem("Source").activate();
openOn(PACKAGE_NAME + ".D1", "beans.xml", null);
- assertTrue("ERROR: redirected to " + getEd(),
+ assertTrue("ERROR: redirected to " + getEd().getTitle(),
getEd().getTitle().equals("D1.java"));
createComponent(CDICOMPONENT.INTERCEPTOR, "Interceptor1", PACKAGE_NAME,
@@ -132,6 +132,7 @@
/*
* https://issues.jboss.org/browse/JBIDE-6251
*/
+
@Test
public void testDisposerProducerOpenOn() {
@@ -164,10 +165,10 @@
setEd(bot.activeEditor().toTextEditor());
CDIUtil.replaceInEditor(getEd(), bot, " event", " event");
- openOn("observerMethod", "MyBean4.java", "Open CDI Events");
+ openOn("observerMethod", "MyBean4.java", "Open CDI Event");
assertTrue(getEd().toTextEditor().getSelection().equals("event"));
- openOn("Event<MyBean4> event", "MyBean3.java", "Open CDI Observer Methods");
+ openOn("Event<MyBean4> event", "MyBean3.java", "Open CDI Observer Method");
assertTrue(getEd().toTextEditor().getSelection().equals("observerMethod"));
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-10-28 11:19:44 UTC (rev 36067)
@@ -152,6 +152,7 @@
* CDI Quick Fix test operates over validation
* concerning about general Bean component
*/
+
@Test
public void testBeanQF() {
String className = "MyBean";
@@ -655,8 +656,7 @@
case SPECIALIZES:
case SERIALIZABLE:
warningType = ((comp == CDICOMPONENT.BEAN)?true:false);
- break;
- case TYPED:
+ break;
case DISPOSES:
case OBSERVES:
case DECORATOR:
@@ -676,7 +676,10 @@
case SERIALIZABLE:
problemsContains = "declares a passivating scope SessionScoped";
break;
+ case NAMED:
+ problemsContains = "should not have a name";
}
+
if (className.equals("BrokenFarm.java")) {
problemsContains = "Multiple beans are eligible";
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-10-28 11:19:44 UTC (rev 36067)
@@ -180,7 +180,7 @@
}
} else {
getEd().setFocus();
- bot.sleep(Timing.time500MS());
+ bot.sleep(Timing.time2S());
getEd().pressShortcut(Keystrokes.F3);
}
bot.sleep(Timing.time1S());
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r36066 - trunk/as/docs/reference/en-US/images/perspective.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-27 21:27:02 -0400 (Thu, 27 Oct 2011)
New Revision: 36066
Modified:
trunk/as/docs/reference/en-US/images/perspective/perspective_7a.png
Log:
updated
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_7a.png
===================================================================
(Binary files differ)
12 years, 6 months
- 1
- 0