JBoss Tools SVN: r25292 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-29 06:27:46 -0400 (Wed, 29 Sep 2010)
New Revision: 25292
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/browse/JBIDE-7193
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-09-29 09:46:44 UTC (rev 25291)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-09-29 10:27:46 UTC (rev 25292)
@@ -8,6 +8,14 @@
ESB.rule_set=Rule Set
ESB.rule_language=Rule Language
ESB.rule_reload=Rule Reload
+ESB.rule_audit_type=Rule Audit Type
+ESB.rule_audit_file=Rule Audit File
+ESB.rule_audit_interval=Rule Audit Interval
+ESB.rule_clock_type=Rule Clock Type
+ESB.rule_event_processing_type=Rule Event Processing
+ESB.rule_fire_method=Rule Fire Method
+ESB.rule_multithread_evaluation=Rule Multithread Evaluation
+ESB.rule_max_threads=Rule Max Threads
ESB.script=Script
ESB.classification=Classification
ESB.message_store_class=Message Store Class
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-09-29 09:46:44 UTC (rev 25291)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-09-29 10:27:46 UTC (rev 25292)
@@ -434,7 +434,7 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=advanced"
name="rule audit type" xmlname="ruleAuditType">
- <Constraint loader="ListString">
+ <Constraint loader="List">
<value/>
<value name="CONSOLE"/>
<value name="FILE"/>
@@ -454,7 +454,7 @@
name="rule audit interval" xmlname="ruleAuditInterval"/>
<XModelAttribute PROPERTIES="pre=true;category=advanced"
default="Default(REALTIME)" name="rule clock type" xmlname="ruleClockType">
- <Constraint loader="ListString">
+ <Constraint loader="List">
<value name="Default(REALTIME)"/>
<value name="REALTIME"/>
<value name="PSEUDO"/>
@@ -463,7 +463,7 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=advanced"
default="Default(CLOUD)" name="rule event processing type" xmlname="ruleEventProcessingType">
- <Constraint loader="ListString">
+ <Constraint loader="List">
<value name="Default(CLOUD)"/>
<value name="CLOUD"/>
<value name="STREAM"/>
@@ -472,13 +472,24 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=advanced"
default="Default(FIRE_ALL_RULES)" name="rule fire method" xmlname="ruleFireMethod">
- <Constraint loader="ListString">
+ <Constraint loader="List">
<value name="Default(FIRE_ALL_RULES)"/>
<value name="FIRE_ALL_RULES"/>
<value name="FIRE_UNTIL_HALT"/>
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ default="Default(false)" name="rule multithread evaluation" xmlname="ruleMultithreadEvaluation">
+ <Constraint loader="ListString">
+ <value name="Default(false)"/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="rule max threads" xmlname="ruleMaxThreads"/>
<XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
<Constraint loader="ListString">
<value name="process"/>
14 years, 5 months
JBoss Tools SVN: r25291 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-09-29 05:46:44 -0400 (Wed, 29 Sep 2010)
New Revision: 25291
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java
Log:
JBIDE-7198 https://jira.jboss.org/browse/JBIDE-7198 : DnD in VPE starts while using scrollbars
- resolved: handling of 'dragstart' event is moved from document to content area
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java 2010-09-29 09:37:51 UTC (rev 25290)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java 2010-09-29 09:46:44 UTC (rev 25291)
@@ -96,6 +96,11 @@
contentArea.addEventListener(MozillaEventAdapter.MOUSEMOVEEVENTTYPE, this, false);
contentArea.addEventListener(MozillaEventAdapter.CONTEXTMENUEVENTTYPE, this, false);
contentArea.addEventListener(MozillaEventAdapter.DBLCLICK, this, false);
+
+ /* yradtsevich: JBIDE-7198: 'dragstart' event has to be added
+ * just to contentArea, rather than to document. Otherwise
+ * the event is fired also on the scrollbars. */
+ contentArea.addEventListener(MozillaEventAdapter.DRAGSTART, this, false);
}
if (window != null) {
window.addEventListener(MozillaEventAdapter.MOZAFTERPAINT, this, false);
@@ -109,7 +114,6 @@
document.addEventListener(MozillaEventAdapter.DRAGENTEREVENT, this, false);
document.addEventListener(MozillaEventAdapter.DRAGEND,this, false);
document.addEventListener(MozillaEventAdapter.DRAGEXITEVENT,this, false);
- document.addEventListener(MozillaEventAdapter.DRAGSTART, this, false);
document.addEventListener(MozillaEventAdapter.DRAGOVEREVENT, this, false);
document.addEventListener(MozillaEventAdapter.KEYPRESS, this, false);
@@ -132,6 +136,9 @@
contentArea.removeEventListener(MozillaEventAdapter.MOUSEMOVEEVENTTYPE, this, false);
contentArea.removeEventListener(MozillaEventAdapter.CONTEXTMENUEVENTTYPE, this, false);
contentArea.removeEventListener(MozillaEventAdapter.DBLCLICK, this, false);
+
+ contentArea.removeEventListener(MozillaEventAdapter.DRAGSTART, this, false);
+
contentArea = null;
}
if (document != null) {
@@ -139,7 +146,6 @@
document.removeEventListener(MozillaEventAdapter.DRAGENTEREVENT, this, false);
document.removeEventListener(MozillaEventAdapter.DRAGEND, this, false);
document.removeEventListener(MozillaEventAdapter.DRAGEXITEVENT, this, false);
- document.removeEventListener(MozillaEventAdapter.DRAGSTART, this, false);
document.removeEventListener(MozillaEventAdapter.DRAGOVEREVENT, this, false);
document.removeEventListener(MozillaEventAdapter.KEYPRESS, this, false);
14 years, 5 months
JBoss Tools SVN: r25290 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-29 05:37:51 -0400 (Wed, 29 Sep 2010)
New Revision: 25290
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-7208] corrected bad url schemes in JBossToolsUsageRequestsTests
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 09:12:49 UTC (rev 25289)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 09:37:51 UTC (rev 25290)
@@ -971,7 +971,7 @@
+ "&utmfl=1.6.0_20"
+ "&utmr=0"
+ "&utm_content=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testJBossToolsVersionInAdContent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testJBossToolsVersionInAdContent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1013,7 +1013,7 @@
+ "&utmdt=testWinWin7UserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testWinWin7UserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testWinWin7UserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297885388356354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1034,7 +1034,7 @@
+ "&utmdt=testWinVistaUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testWinVistaUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testWinVistaUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297885388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1055,7 +1055,7 @@
+ "&utmdt=testWinXPUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testWinXPUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testWinXPUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297245388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1076,7 +1076,7 @@
+ "&utmdt=testWin2000UserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testWin2000UserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testWin2000UserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297292388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1097,7 +1097,7 @@
+ "&utmdt=testMacLeopardUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testMacLeopardUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testMacLeopardUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297292388397333581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1118,7 +1118,7 @@
+ "&utmdt=testMacSnowLeopardUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testMacSnowLeopardUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testMacSnowLeopardUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297292388397333581222108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1139,7 +1139,7 @@
+ "&utmdt=testLinuxFedoraUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxFedoraUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxFedoraUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1160,7 +1160,7 @@
+ "&utmdt=testLinuxUbuntuUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxUbuntuUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxUbuntuUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.46667292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1181,7 +1181,7 @@
+ "&utmdt=testLinuxSUSEUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSUSEUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSUSEUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1202,7 +1202,7 @@
+ "&utmdt=testLinuxSlackwareUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSlackwareUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSlackwareUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
@@ -1223,7 +1223,7 @@
+ "&utmdt=testLinuxGentooUserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxGentooUserAgent")
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxGentooUserAgent").getURI()
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
14 years, 5 months
JBoss Tools SVN: r25289 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-29 05:12:49 -0400 (Wed, 29 Sep 2010)
New Revision: 25289
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[7142] test requests for different linux distros added
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 09:05:49 UTC (rev 25288)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 09:12:49 UTC (rev 25289)
@@ -1126,10 +1126,118 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Test
+ public void testLinuxFedoraUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.14) Gecko/20080612 Fedora/2.0.0.14-20080612.fc8.acer Firefox/2.0.0.14");
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=958344444"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testLinuxFedoraUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxFedoraUserAgent")
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.43297292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testLinuxUbuntuUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod("Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8");
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=958877444"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testLinuxUbuntuUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxUbuntuUserAgent")
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.46667292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testLinuxSUSEUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod("Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.8) Gecko/20100723 SUSE/3.6.8-0.1.1 Firefox/3.6.8");
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=957077444"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testLinuxSUSEUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSUSEUserAgent")
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testLinuxSlackwareUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod("Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.3) Gecko/20090914 Slackware/13.0_stable Firefox/3.5.3");
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=957077444"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testLinuxSlackwareUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxSlackwareUserAgent")
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testLinuxGentooUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.3) Gecko/20090912 Gentoo Firefox/3.5.3 FirePHP/0.3");
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=957077444"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testLinuxGentooUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=" + new JBossToolsTestsFocusPoint("testLinuxGentooUserAgent")
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
protected class TestHttpGetMethod extends HttpGetRequest {
private HttpURLConnection urlConnection;
+ public TestHttpGetMethod(String userAgentString) {
+ this(userAgentString, new SystemOutLogger());
+ }
+
public TestHttpGetMethod(UserAgentString userAgentString) {
this(userAgentString.toString(), new SystemOutLogger());
}
14 years, 5 months
JBoss Tools SVN: r25288 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: src/org/jboss/tools/cdi/bot/test/uiutils/wizards and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-09-29 05:05:49 -0400 (Wed, 29 Sep 2010)
New Revision: 25288
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardType.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
Log:
adding bot tests for Interceptor and Decorator wizards
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch 2010-09-29 09:05:49 UTC (rev 25288)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.cdi.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Djava.library.path=/space/java/sdk/jdk1.6.0_20/jre/lib/i386/client:/space/java/sdk/jdk1.6.0_20/jre/lib/i386:/usr/lib/xulrunner-addons:/usr/lib/xulrunner-addons:/usr/java/packages/lib/i386:/lib:/usr/lib:/usr/lib/jni -Xms512m -Xmx1024m -Dswtbot.test.properties.file=/home/lukas/swtbot.properties -Dusage_reporting_enabled=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.epp.package.jee.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2010-09-29 04:32:38 UTC (rev 25287)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2010-09-29 09:05:49 UTC (rev 25288)
@@ -12,11 +12,18 @@
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Logger;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.BoolResult;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
public class CDIWizard extends Wizard {
@@ -171,6 +178,7 @@
switch (type) {
case INTERCEPTOR_BINDING:
case STEREOTYPE:
+ case INTERCEPTOR:
bot().button("Add", 0).click();
SWTBotShell sh = bot().activeShell();
sh.bot().text().setText(ib);
@@ -204,7 +212,106 @@
return Arrays.asList(bot().listWithLabel("Stereotypes:").getItems());
}
+ public CDIWizard setPublic(boolean isPublic) {
+ switch (type) {
+ case DECORATOR:
+ if (isPublic) {
+ bot().radio("public").click();
+ } else {
+ class Radio2 extends SWTBotRadio {
+ Radio2(Button b) {
+ super(b);
+ }
+
+ @Override
+ public SWTBotRadio click() {
+ return (SWTBotRadio) click(true);
+ }
+ }
+ final Button b = bot().radio("default").widget;
+ new Radio2(b).click();
+ }
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+ public CDIWizard setFieldName(String name) {
+ switch (type) {
+ case DECORATOR:
+ setText("Delegate Field Name:", name);
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
+ public CDIWizard addInterface(String intf) {
+ switch (type) {
+ case DECORATOR:
+ bot().button("Add...", 0).click();
+ SWTBotShell sh = bot().activeShell();
+ sh.bot().text().setText(intf);
+ sh.bot().table().getTableItem(0).select();
+ sh.bot().button("OK").click();
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
+ public CDIWizard setAbstract(boolean isAbstract) {
+ switch (type) {
+ case DECORATOR:
+ setCheckbox("abstract", isAbstract);
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
+ public CDIWizard setFinal(boolean isFinal) {
+ switch (type) {
+ case DECORATOR:
+ setCheckbox("final", isFinal);
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
+ public CDIWizard setSuperclass(String name) {
+ switch (type) {
+ case INTERCEPTOR:
+ bot().button("Browse...", 2).click();
+ SWTBotShell sh = bot().activeShell();
+ sh.bot().text().setText(name);
+ sh.bot().table().getTableItem(0).select();
+ sh.bot().button("OK").click();
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
+ public CDIWizard setMethodName(String name) {
+ switch (type) {
+ case INTERCEPTOR:
+ setText("Around Invoke Method Name:", name);
+ break;
+ default:
+ throw new UnsupportedOperationException();
+ }
+ return this;
+ }
+
private void setCheckbox(String label, boolean set) {
SWTBotCheckBox c = bot().checkBox(label);
if (c.isChecked() != set) {
@@ -225,4 +332,5 @@
SWTBotCombo c = bot().comboBoxWithLabel(label);
c.setSelection(value);
}
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardType.java 2010-09-29 04:32:38 UTC (rev 25287)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardType.java 2010-09-29 09:05:49 UTC (rev 25288)
@@ -11,7 +11,7 @@
package org.jboss.tools.cdi.bot.test.uiutils.wizards;
public enum CDIWizardType {
- INTERCEPTOR_BINDING, QUALIFIER, SCOPE, STEREOTYPE;
+ INTERCEPTOR_BINDING, QUALIFIER, SCOPE, STEREOTYPE, DECORATOR, INTERCEPTOR;
String getName() {
switch (this) {
@@ -23,12 +23,20 @@
return "Scope";
case STEREOTYPE:
return "Stereotype";
+ case DECORATOR:
+ return "Decorator";
+ case INTERCEPTOR:
+ return "Interceptor";
default:
throw new AssertionError("Unknown type");
}
}
public String getAnnotationType() {
- return getName() + " Annotation Type";
+ return isAnnotation() ? getName() + " Annotation Type" : getName() + " Type";
}
+
+ private boolean isAnnotation() {
+ return this.ordinal() < DECORATOR.ordinal();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2010-09-29 04:32:38 UTC (rev 25287)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2010-09-29 09:05:49 UTC (rev 25288)
@@ -62,6 +62,7 @@
protected void setText(String label, String text) {
SWTBotText t = bot().textWithLabel(label);
+ t.setFocus();
t.setText(text);
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2010-09-29 04:32:38 UTC (rev 25287)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2010-09-29 09:05:49 UTC (rev 25288)
@@ -255,6 +255,74 @@
assertFalse(code.startsWith("/**"));
}
+ @Test
+ public void testDecorator() {
+ CDIWizard w = decorator("cdi", "", "java.lang.Comparable", null, true, true, false, false);
+ w.finish();
+ util.waitForNonIgnoredJobs();
+ SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
+ assertTrue(("ComparableDecorator.java").equals(ed.getTitle()));
+ String code = ed.toTextEditor().getText();
+ L.fine(code);
+ assertTrue(code.contains("@Decorator"));
+ assertTrue(code.contains("abstract class"));
+ assertTrue(code.contains("@Delegate"));
+ assertTrue(code.contains("@Inject"));
+ assertTrue(code.contains("@Any"));
+ assertTrue(code.contains("private Comparable<T> comparable;"));
+ assertFalse(code.contains("final"));
+ assertFalse(code.startsWith("/**"));
+
+ w = decorator("cdi", "", "java.util.Map", "field", false, false, true, true);
+ w.finish();
+ util.waitForNonIgnoredJobs();
+ ed = new SWTWorkbenchBot().activeEditor();
+ assertTrue(("MapDecorator.java").equals(ed.getTitle()));
+ code = ed.toTextEditor().getText();
+ L.fine(code);
+ assertTrue(code.contains("@Decorator"));
+ assertFalse(code.contains("abstract"));
+ assertTrue(code.contains("@Delegate"));
+ assertTrue(code.contains("@Inject"));
+ assertTrue(code.contains("@Any"));
+ assertTrue(code.contains("private Map<K, V> field;"));
+ assertTrue(code.contains("final class"));
+ assertFalse(code.contains("public final"));
+ assertTrue(code.startsWith("/**"));
+ }
+
+ @Test
+ public void testInterceptor() {
+ CDIWizard w = interceptor("cdi", "I1", "B2", null, null, false);
+ w.finish();
+ util.waitForNonIgnoredJobs();
+ SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
+ assertTrue(("I1.java").equals(ed.getTitle()));
+ String code = ed.toTextEditor().getText();
+ L.fine(code);
+ assertTrue(code.contains("@B2"));
+ assertTrue(code.contains("@Interceptor"));
+ assertTrue(code.contains("@AroundInvoke"));
+ assertTrue(code.contains("public Object manage(InvocationContext ic) throws Exception {"));
+ assertFalse(code.contains("final"));
+ assertFalse(code.startsWith("/**"));
+
+ w = interceptor("cdi", "I2", "B4", "java.util.Date", "sample", true);
+ w.finish();
+ util.waitForNonIgnoredJobs();
+ ed = new SWTWorkbenchBot().activeEditor();
+ assertTrue(("I2.java").equals(ed.getTitle()));
+ code = ed.toTextEditor().getText();
+ L.fine(code);
+ assertTrue(code.contains("@B4"));
+ assertTrue(code.contains("@Interceptor"));
+ assertTrue(code.contains("@AroundInvoke"));
+ assertTrue(code.contains("public Object sample(InvocationContext ic) throws Exception {"));
+ assertFalse(code.contains("final"));
+ assertTrue(code.startsWith("/**"));
+ assertTrue(code.contains("extends Date"));
+ }
+
private static SWTBotMenu nodeContextMenu(final SWTBotTree tree,
SWTBotTreeItem item, final String... menu) {
assert menu.length > 0;
@@ -303,11 +371,33 @@
return target != null ? w.setTarget(target) : w;
}
+ private CDIWizard decorator(String pkg, String name, String intf, String fieldName,
+ boolean isPublic, boolean isAbstract, boolean isFinal, boolean comments) {
+ CDIWizard w = create(CDIWizardType.DECORATOR, pkg, name, comments);
+ w = w.addInterface(intf).setPublic(isPublic).setFinal(isFinal).setAbstract(isAbstract);
+ return fieldName != null ? w.setFieldName(fieldName) : w;
+ }
+
+ private CDIWizard interceptor(String pkg, String name, String ibinding,
+ String superclass, String method, boolean comments) {
+ CDIWizard w = create(CDIWizardType.INTERCEPTOR, pkg, name, comments);
+ if (superclass != null) {
+ w = w.setSuperclass(superclass);
+ }
+ if (method != null) {
+ w = w.setMethodName(method);
+ }
+ return w.addIBinding(ibinding);
+ }
+
private CDIWizard create(CDIWizardType type, String pkg, String name,
boolean inherited, boolean comments) {
+ return create(type, pkg, name, comments).setInherited(inherited);
+ }
+
+ private CDIWizard create(CDIWizardType type, String pkg, String name, boolean comments) {
CDIWizard p = new NewCDIFileWizard(type).run();
- return p.setPackage(pkg).setName(name).setInherited(inherited)
- .setGenerateComments(comments);
+ return p.setPackage(pkg).setName(name).setGenerateComments(comments);
}
}
14 years, 5 months
JBoss Tools SVN: r25287 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-09-29 00:32:38 -0400 (Wed, 29 Sep 2010)
New Revision: 25287
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java
Log:
JBIDE-7049
DONE
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2010-09-28 19:59:36 UTC (rev 25286)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2010-09-29 04:32:38 UTC (rev 25287)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors.model;
+import java.util.Iterator;
+import java.util.List;
+
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -18,7 +21,16 @@
import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateXMLModel;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel;
+import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* @author Dart
@@ -26,14 +38,15 @@
*/
public class InputDataTreeNodeModel extends TreeNodeModel {
- public InputDataTreeNodeModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) {
+ public InputDataTreeNodeModel(Object data,
+ ITreeContentProvider contentProvider, ILabelProvider labelProvider) {
super(data, contentProvider, labelProvider);
// TODO Auto-generated constructor stub
}
@Override
- protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider,
- ILabelProvider labelProvider) {
+ protected TreeNodeModel createChildModel(Object model,
+ ITreeContentProvider contentProvider, ILabelProvider labelProvider) {
return new InputDataTreeNodeModel(model, contentProvider, labelProvider);
}
@@ -71,28 +84,71 @@
@Override
public boolean canLinkWithTarget(Object model) {
TreeNodeModel targetNode = (TreeNodeModel) model;
-
- if(targetNode == this || targetNode.getModelRootNode() == getModelRootNode()) {
+ System.out.println(targetNode);
+ if (targetNode == this
+ || targetNode.getModelRootNode() == getModelRootNode()) {
return false;
}
-
+
Object data = AdapterFactoryEditingDomain.unwrap(targetNode.getData());
+ AbstractSmooksGraphicalModel pm = targetNode;
+ while (pm != null && !(pm instanceof FreemarkerTemplateGraphicalModel)) {
+ pm = pm.getParent();
+ }
+ if (data instanceof IFreemarkerTemplateModel && pm instanceof FreemarkerTemplateGraphicalModel) {
+ TemplateBuilder builder = ((FreemarkerTemplateGraphicalModel) pm).getTemplateBuilder();
+ if (((IFreemarkerTemplateModel) data).isHidden(builder)) {
+ return false;
+ }
+ if (data instanceof FreemarkerTemplateXMLModel) {
+ if (!((FreemarkerTemplateXMLModel) data).getXMLNodeChildren().isEmpty()) {
+ return false;
+ }
+ }
+
+ List<TreeNodeConnection> exsitingConnection = targetNode.getTargetConnections();
+ if (!exsitingConnection.isEmpty())
+ return false;
+ for (Iterator<?> iterator = exsitingConnection.iterator(); iterator.hasNext();) {
+ TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next();
+ if (treeNodeConnection.getSourceNode() == this) {
+ return false;
+ }
+ }
+
+ AbstractSmooksGraphicalModel pgm = targetNode;
+ while (pgm != null && pgm instanceof FreemarkerTemplateNodeGraphicalModel) {
+ Object pd = ((FreemarkerTemplateNodeGraphicalModel) pgm).getData();
+ if (pd instanceof IFreemarkerTemplateModel) {
+ IFreemarkerTemplateModel iFreemarkerTemplateModel = (IFreemarkerTemplateModel) pd;
+ if (iFreemarkerTemplateModel.isManyOccurs() && pgm.getTargetConnections().isEmpty()) {
+ Node modelNode = iFreemarkerTemplateModel.getModelNode();
+ if (modelNode instanceof Element) {
+ return !ModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode);
+ } else {
+ return false;
+ }
+ }
+ }
+ pgm = pgm.getParent();
+ }
+ }
if (data instanceof TagPropertyObject) {
// Only OK to link to an attribute from a valid Value node...
return isValidValueNode();
- } else if(data instanceof TagObject) {
- if(targetNode.isValidValueNode()) {
+ } else if (data instanceof TagObject) {
+ if (targetNode.isValidValueNode()) {
return isValidValueNode();
- } else if(targetNode.isValidCollectionNode()) {
- return isValidCollectionNode();
+ } else if (targetNode.isValidCollectionNode()) {
+ return isValidCollectionNode();
}
} else if (data instanceof EObject) {
if (SmooksUIUtils.getSelectorFeature((EObject) data) != null) {
return true;
}
}
-
+
return false;
}
14 years, 5 months
JBoss Tools SVN: r25286 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-09-28 15:59:36 -0400 (Tue, 28 Sep 2010)
New Revision: 25286
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar
Log:
JBDS-1324 ModeShape plugin needs to have its modeshape client jar replaced from the SOA-P build. This is the SOA-P ER2 ModeShape client jar given to me by Van Halbert.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar
===================================================================
(Binary files differ)
14 years, 5 months
JBoss Tools SVN: r25285 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-28 14:08:17 -0400 (Tue, 28 Sep 2010)
New Revision: 25285
Modified:
trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml
trunk/build/target-platform/target2ant.xsl
Log:
add latestVersionOnly="true"
Modified: trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml 2010-09-28 16:31:32 UTC (rev 25284)
+++ trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml 2010-09-28 18:08:17 UTC (rev 25285)
@@ -25,7 +25,7 @@
<property name="followStrict" value="false" />
<echo level="info">Download features/plugins into ${repo.dir}</echo>
<p2.mirror destination="file:${repo.dir}" verbose="${verbose}">
- <slicingOptions includeFeatures="true" followStrict="${followStrict}" />
+ <slicingOptions includeFeatures="true" followStrict="${followStrict}" latestVersionOnly="true" />
<source>
<repository location="http://m2eclipse.sonatype.org/sites/m2e/" />
<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
Modified: trunk/build/target-platform/target2ant.xsl
===================================================================
--- trunk/build/target-platform/target2ant.xsl 2010-09-28 16:31:32 UTC (rev 25284)
+++ trunk/build/target-platform/target2ant.xsl 2010-09-28 18:08:17 UTC (rev 25285)
@@ -45,7 +45,7 @@
<property name="followStrict" value="false" />
<echo level="info">Download features/plugins into ${repo.dir}</echo>
<p2.mirror destination="{$destination}" verbose="{$verbose}">
- <slicingOptions includeFeatures="true" followStrict="{$followStrict}" />
+ <slicingOptions includeFeatures="true" followStrict="{$followStrict}" latestVersionOnly="true" />
<source>
<xsl:apply-templates select="//repository" />
</source>
14 years, 5 months
JBoss Tools SVN: r25284 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-28 12:31:32 -0400 (Tue, 28 Sep 2010)
New Revision: 25284
Added:
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
Log:
[7144] launcher corrected
Added: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-09-28 16:31:32 UTC (rev 25284)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.ui.bot.ext,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.verification.test,org.jboss.tools.common.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.swt@default:default,org.eclipse.core.databinding.property@default:default,org.apache.commons.el@default:default,org.eclipse.jface.text@default:default,org.eclipse.help.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.sdk@default:default,org.apache.lucene@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface@default:default,org.eclipse.core.contenttype@default:default,org.junit4@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false!
,org.eclipse.update.configurator@3:true,org.eclipse.equinox.http.servlet@default:default,org.apache.ant@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.views@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi.services@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.mortbay.jetty.util@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.preferences@default:defaul!
t,org.eclipse.core.filesystem.linux.x86_64@default:false,org.e!
clipse.c
ore.runtime.compatibility.auth@default:default,org.apache.jasper@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.hamcrest.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,org.eclipse.equin!
ox.p2.metadata@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,com.ibm.icu@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r25283 - trunk/usage/plugins/org.jboss.tools.usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-28 12:31:00 -0400 (Tue, 28 Sep 2010)
New Revision: 25283
Removed:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Developer Studio Usage Reporter.launch
Log:
[7144] launcher corrected
Deleted: trunk/usage/plugins/org.jboss.tools.usage/JBoss Developer Studio Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Developer Studio Usage Reporter.launch 2010-09-28 16:24:42 UTC (rev 25282)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Developer Studio Usage Reporter.launch 2010-09-28 16:31:00 UTC (rev 25283)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<setAttribute key="additional_plugins"/>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer Studio Usage Reporter"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.ui.bot.ext,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.verification.test,org.jboss.tools.common.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication2"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties -debug"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-D__usage_reporting_enabled=false"/>
-<booleanAttribute key="pde.generated.config" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<setAttribute key="selected_features">
-<setEntry value="org.jboss.tools.usage.feature:default"/>
-</setAttribute>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.identity@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.views@default:default,org.hamcrest.core@default:default,org.eclipse.core.resources@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.engine@default:default,javax.servlet.jsp@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.databinding@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jface@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.ui@de!
fault:default,org.eclipse.update.configurator@3:true,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.jasper@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface.text@default:default,org.apache.commons.el@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.help@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.jobs@default:default,o!
rg.eclipse.swtbot.ant.optional.junit4@default:false,org.eclips!
e.core.n
et@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf@default:default,org.eclipse.help.base@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.platform@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.net.linux.x86_64@default:false,javax.servlet@default:default,org.apache.ant@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.app@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.servlet@default:default,o!
rg.apache.lucene@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${workspace_loc:org.jboss.tools.usage/config.ini}"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
14 years, 5 months
