JBoss Tools SVN: r36880 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-02 08:49:14 -0500 (Fri, 02 Dec 2011)
New Revision: 36880
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
Log:
Added test for Code Completion functionality for msgs[...
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-02 13:32:34 UTC (rev 36879)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-02 13:49:14 UTC (rev 36880)
@@ -14,7 +14,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.Assertions;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
@@ -304,6 +306,46 @@
expectedProposals);
}
/**
+ * Test Code Completion functionality for msgs[
+ */
+ public void testCodeCompletionOfMsgsWithBrackets(){
+ initFaceletsPageTest();
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ "<h:message ",
+ 0,
+ 0,
+ 0);
+ editor.insertText("\n");
+ String textToInsert = "<h:outputText value=\"#{msg[";
+ final SWTBotShell[] shellsBefore = bot.shells();
+ editor.typeText(textToInsert);
+ bot.sleep(Timing.time2S());
+ // Check Content Assist invoked by typing
+ ContentAssistBot contentAssist = editor.contentAssist();
+ final List<String> caProposals = contentAssist.getProposalList(shellsBefore, bot.shells(), true);
+ String useCodeAssist = "greeting";
+ assertTrue("Content assist has to contain item " + useCodeAssist +
+ " but it does not.",
+ caProposals.contains(useCodeAssist));
+ useCodeAssist = "prompt";
+ assertTrue("Content assist has to contain item " + useCodeAssist +
+ " but it does not.",
+ caProposals.contains(useCodeAssist));
+ // Check Content Assist invoked by Ctrl-Space
+ useCodeAssist = "greeting";
+ contentAssist.checkContentAssist(useCodeAssist, false);
+ useCodeAssist = "prompt";
+ contentAssist.checkContentAssist(useCodeAssist, true);
+ final String textToInsertAtEnd = "\"/>";
+ editor.insertText(editor.cursorPosition().line,
+ editor.cursorPosition().column + 2,
+ textToInsertAtEnd);
+ Assertions.assertSourceEditorContains(editor.getText(),
+ textToInsert + "'" + useCodeAssist + "']}" + textToInsertAtEnd,
+ FACELETS_TEST_PAGE);
+ }
+ /**
* Initialize test which are using facelets test page
*/
private void initFaceletsPageTest() {
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-02 13:32:34 UTC (rev 36879)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-02 13:49:14 UTC (rev 36880)
@@ -95,10 +95,9 @@
}
}
/**
- * Logs proposal list contents, usual for debug purposes
- *
- * @param text
- */
+ * Returns proposal list
+ * @return
+ */
public List<String>getProposalList() {
List<String> result = null;
SWTBotShell shell = openProposalList();
@@ -108,6 +107,24 @@
return result;
}
+ /**
+ * Logs proposal list contents, when Content Assist window is already opened
+ * @param shellsBefore - list of shells before Content Assist was invoked
+ * @param shellsAfter - list of shells after Content Assist was invoked
+ * @param closeShell
+ * @return
+ */
+ public List<String>getProposalList(SWTBotShell[] shellsBefore, SWTBotShell[] shellsAfter, boolean closeShell) {
+ List<String> result = null;
+ SWTBotShell caShell = getContentAssistShell(shellsBefore, shellsAfter);
+ SWTBotTable caTable = getProposalTable(caShell);
+ result = getTableItems(caTable);
+ if (closeShell) {
+ caShell.close();
+ }
+
+ return result;
+ }
// ------------------------------------------------------------
// Private
// ------------------------------------------------------------
14 years
JBoss Tools SVN: r36879 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-02 08:32:34 -0500 (Fri, 02 Dec 2011)
New Revision: 36879
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java
Log:
JBIDE-10217 JBoss Central Search location & defaults
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-12-02 13:17:03 UTC (rev 36878)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-12-02 13:32:34 UTC (rev 36879)
@@ -337,9 +337,6 @@
formText.setText("<form><p>" +
"<img href=\"image\"/>" +
" No entries found." +
- "Check your internet connection and " +
- "<a href=\"networkConnections\">Window > Preferences > General > Network Connections</a> " +
- "preferences" +
"</p></form>",
true, false);
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2011-12-02 13:17:03 UTC (rev 36878)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2011-12-02 13:32:34 UTC (rev 36879)
@@ -225,7 +225,7 @@
}
String message = section.get(INITIAL_MESSAGE);
if (message == null || message.isEmpty()) {
- message = JBossCentralActivator.SEARCH_RED_HAT_CUSTOMER_PORTAL;
+ message = JBossCentralActivator.SEARCH_THE_COMMUNITY;
}
setInitialMessage(message);
14 years
JBoss Tools SVN: r36878 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-12-02 08:17:03 -0500 (Fri, 02 Dec 2011)
New Revision: 36878
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M...
Log:
Added HTML5 quickstart
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M... 2011-12-02 13:08:30 UTC (rev 36877)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.M... 2011-12-02 13:17:03 UTC (rev 36878)
@@ -246,5 +246,45 @@
<importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
<welcome type="cheatsheets" url="/jboss-as-kitchensink/cheatsheets/kitchensink.xml"/>
</project>
+ <project>
+ <category>JBoss AS 7 Quickstarts</category>
+ <name>poh5-helloworld</name>
+ <included-projects>poh5-helloworld</included-projects>
+ <shortDescription>HTML5 Example for mobile devices</shortDescription>
+ <description>This example demonstrates the use of *CDI 1.0* and *JAX-RS* in *JBoss AS 7* using the Plain Old HTML5 (POH5) architecture.
+POH5 is basically a smart, HTML5+CSS3+JavaScript front-end using RESTful services on the backend.</description>
+ <size>7266</size>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.16.0)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature, org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2eclipse, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <!-- no cheatsheet yet
+ <welcome type="cheatsheets" url="/poh5-helloworld/cheatsheets/poh5-helloworld.xml"/>
+ -->
+ </project>
</projects>
14 years
JBoss Tools SVN: r36877 - workspace/snjeza/jbossas7-examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-12-02 08:08:30 -0500 (Fri, 02 Dec 2011)
New Revision: 36877
Added:
workspace/snjeza/jbossas7-examples/poh5-helloworld.zip
Log:
Add POH5 quickstart
Added: workspace/snjeza/jbossas7-examples/poh5-helloworld.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/jbossas7-examples/poh5-helloworld.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years
JBoss Tools SVN: r36876 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-12-02 07:43:10 -0500 (Fri, 02 Dec 2011)
New Revision: 36876
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
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/mapping/VpeDomMapping.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeRenderingTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java
trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9932 - VpeDomMapping was updated to use HashMap iteration, plus some code adjustments.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -34,16 +34,10 @@
*
* @see #isSpanNeeding(Element)
*/
- private static final String[] spanMarkers = {
+ private static final String[] SPAN_MARKERS = {
JSF.ATTR_STYLE, JSF.ATTR_STYLE_CLASS, JSF.ATTR_ID,
JSF.ATTR_DIR, JSF.ATTR_TITLE, JSF.ATTR_LANG};
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
- */
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -74,10 +68,10 @@
* Returns {@code true} if given {@code element} should be
* rendered in {@code SPAN} tag, otherwise returns {@code false}.
*
- * @see #spanMarkers
+ * @see #SPAN_MARKERS
*/
private boolean isSpanNeeding(Element element) {
- for (String spanMarker : spanMarkers) {
+ for (String spanMarker : SPAN_MARKERS) {
if (element.hasAttribute(spanMarker)) {
return true;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -44,11 +44,8 @@
if (sorceAdapter == null) {
return;
}
-
domMapping.mapNodes(nodeMapping);
Node sourceNode = nodeMapping.getSourceNode();
-
-
/* yradtsevich:
* checking for ((INodeNotifier) sourceNode).getExistingAdapter(sorceAdapter) == null
* is not used because of JBIDE-8049 (JBIDE-8051)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -49,17 +49,9 @@
super(domMapping, sorceAdapter, visualEditor, pageContext);
}
- /**
- *
- * @param sourceNode
- * @param visualOldContainer
- * @return
- */
@Override
- public nsIDOMNode createNode(Node sourceNode, nsIDOMNode visualOldContainer) {
-
+ public nsIDOMNode createNode(Node sourceNode, nsIDOMNode visualOldContainer, boolean onlyOneIncludeStack) {
Set<?> ifDependencySet = new HashSet();
-
if(sourceNode==null||(
sourceNode.getNodeType()!=Node.TEXT_NODE
&&sourceNode.getNodeType()!=Node.ELEMENT_NODE
@@ -74,8 +66,8 @@
//FIX FOR JBIDE-1568, added by Max Areshkau
try {
if (getPageContext().getElService().isELNode(sourceNode)) {
- final Node sourceNodeProxy = VpeProxyUtil.createProxyForELExpressionNode(getPageContext(),
- sourceNode);
+ final Node sourceNodeProxy = VpeProxyUtil.createProxyForELExpressionNode(
+ getPageContext(), sourceNode);
try {
creationData = template.create(getPageContext(),
sourceNodeProxy, getVisualDocument());
@@ -84,10 +76,9 @@
} catch(ClassCastException ex) {
VpePlugin.reportProblem(ex);
//then we create template without using proxy
- creationData = template.create(getPageContext(), sourceNode,
- getVisualDocument());
+ creationData = template.create(getPageContext(),
+ sourceNode, getVisualDocument());
}
-
} else {
creationData = template.create(getPageContext(), sourceNode, getVisualDocument());
}
@@ -99,13 +90,10 @@
getPageContext().setCurrentVisualNode(null);
nsIDOMNode visualNewNode;
visualNewNode = creationData.getNode();
-
if(sourceNode instanceof Element && visualNewNode != null) {
setTooltip((Element)sourceNode, queryInterface(visualNewNode, nsIDOMElement.class));
correctVisualAttribute(queryInterface(visualNewNode, nsIDOMElement.class));
}
-
-
if (template.hasChildren()) {
List<?> childrenInfoList = creationData.getChildrenInfoList();
if (childrenInfoList == null) {
@@ -114,7 +102,6 @@
addChildren(template, sourceNode, visualOldContainer, childrenInfoList);
}
}
-
/*
* Setting current visual node was added
* to fix h:dataTable content visibility on Preview tab.
@@ -126,5 +113,4 @@
return visualNewNode;
}
-
-}
+}
\ No newline at end of file
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-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -261,11 +261,16 @@
* @return {@code true} if and only if the visual representation is created and added successfully
*/
private boolean addNode(Node sourceNode, nsIDOMNode visualNextNode, nsIDOMNode visualContainer) {
+ /*
+ * Check includeStack size. During node creation it could be increased.
+ * !IMPORTANT! Thus the state should be check in the beginning
+ * and stored until the visual element is added into DOM.
+ * For each node there should be a separate variable.
+ * !IMPORTANT! It is used to register nodes in VpeDomMapping.
+ */
+ boolean onlyOneIncludeStack = isCurrentMainDocument();
try {
-
- nsIDOMNode visualNewNode = createNode(sourceNode, visualContainer);
-
-
+ nsIDOMNode visualNewNode = createNode(sourceNode, visualContainer, onlyOneIncludeStack);
// Commented as fix for JBIDE-3012.
// // Fix for JBIDE-1097
// try {
@@ -277,35 +282,40 @@
// } catch (XPCOMException ex) {
// // just ignore this exception
// }
-
- if (visualNewNode != null) {
- /*
- * https://jira.jboss.org/jira/browse/JBIDE-3373
- * Do not add additional visual node for f:facet
- * when it is inserted into existing one.
- */
- nsIDOMElement element = null;
- try {
- element = queryInterface(visualNewNode, nsIDOMElement.class);
- } catch (org.mozilla.xpcom.XPCOMException e) {
- /*
- * Cannot parse node to element,
- * do nothing
- */
- }
- if (!((null != element) && element.hasAttribute(VPE_FACET))) {
- if (visualNextNode == null) {
- visualContainer.appendChild(visualNewNode);
- } else {
- visualContainer.insertBefore(visualNewNode, visualNextNode);
+ if (visualNewNode != null) {
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3373
+ * Do not add additional visual node for f:facet
+ * when it is inserted into existing one.
+ */
+ nsIDOMElement element = null;
+ try {
+ element = queryInterface(visualNewNode, nsIDOMElement.class);
+ } catch (org.mozilla.xpcom.XPCOMException e) {
+ /*
+ * Cannot parse node to element, do nothing
+ */
+ }
+ if (!((null != element) && element.hasAttribute(VPE_FACET))) {
+ nsIDOMNode registeredVisualNewNode = null;
+ if (visualNextNode == null) {
+ registeredVisualNewNode = visualContainer.appendChild(visualNewNode);
+ } else {
+ registeredVisualNewNode = visualContainer.insertBefore(visualNewNode, visualNextNode);
+ }
+ /*
+ * https://issues.jboss.org/browse/JBIDE-9932
+ * Update visual node in vpe mapping.
+ */
+ if (onlyOneIncludeStack) {
+ domMapping.remapVisualNode(visualNewNode, registeredVisualNewNode);
+ }
+ }
+ return true;
}
- }
- return true;
- }
- } catch(XPCOMException xpcomException) {
+ } catch (XPCOMException xpcomException) {
VpePlugin.reportProblem(xpcomException);
}
-
return false;
}
@@ -316,10 +326,8 @@
* @param visualOldContainer visual node, in which the caller plans to insert new visual node
* @return new visual node
*/
- public nsIDOMNode createNode(Node sourceNode,
- nsIDOMNode visualOldContainer) throws VpeDisposeException {
-
- boolean registerFlag = isCurrentMainDocument();
+ public nsIDOMNode createNode(Node sourceNode, nsIDOMNode visualOldContainer,
+ boolean onlyOneIncludeStack) throws VpeDisposeException {
//it's check for initialization visualController,
//if we trying to process some event when controller
//hasn't been initialized, it's causes
@@ -359,7 +367,6 @@
pageContext.setCurrentVisualNode(visualOldContainer);
VpeTemplate template = getTemplateManager().getTemplate(pageContext,
sourceNode, ifDependencySet);
-
VpeCreationData creationData = null;
Node sourceNodeProxy = null;
// FIX FOR JBIDE-1568, added by Max Areshkau
@@ -444,7 +451,8 @@
&& visualNewNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
setTooltip((Element) sourceNode, queryInterface(visualNewNode, nsIDOMElement.class));
}
- if (registerFlag) {
+ VpeElementMapping elementMapping = null;
+ if (onlyOneIncludeStack) {
final VpeElementData data = creationData.getElementData();
if ((sourceNodeProxy != null) && (data != null)
&& (data.getNodesData() != null)
@@ -453,8 +461,8 @@
if (nodeData.getSourceNode() != null) {
Node attr = null;
if(sourceNode.getAttributes()!=null) {
- attr = sourceNode.getAttributes().getNamedItem(nodeData
- .getSourceNode().getNodeName());
+ attr = sourceNode.getAttributes().getNamedItem(
+ nodeData.getSourceNode().getNodeName());
} else {
//Text node haven't child nodes, but it's node.
attr = sourceNode;
@@ -463,9 +471,8 @@
nodeData.setEditable(false);
}
}
-
}
- VpeElementMapping elementMapping = new VpeElementMapping(
+ elementMapping = new VpeElementMapping(
sourceNode, visualNewNode, template,
ifDependencySet, creationData.getData(), data);
registerNodes(elementMapping);
@@ -552,14 +559,12 @@
for (int i = 0; i < len; i++) {
Node sourceNode = sourceNodes.item(i);
if (addNode(sourceNode, null, visualContainer)) {
- if (Node.ELEMENT_NODE == sourceNode.getNodeType()) {
- }
+// if (Node.ELEMENT_NODE == sourceNode.getNodeType()) { }
childrenCount++;
}
}
if (childrenCount == 0) {
- setPseudoContent(containerTemplate, sourceContainer,
- visualContainer);
+ setPseudoContent(containerTemplate, sourceContainer,visualContainer);
}
}
@@ -1430,8 +1435,7 @@
protected void setReadOnlyElement(nsIDOMElement node) {
String style = node.getAttribute(VpeStyleUtil.ATTRIBUTE_STYLE);
- style = VpeStyleUtil.setParameterInStyle(style, "-moz-user-modify", //$NON-NLS-1$
- "read-only"); //$NON-NLS-1$
+ style = VpeStyleUtil.setParameterInStyle(style, "-moz-user-modify", "read-only"); //$NON-NLS-1$ //$NON-NLS-2$
node.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, style);
}
@@ -1474,7 +1478,7 @@
}
return false;
}
-
+
public boolean isCurrentMainDocument() {
return includeStack.size() <= 1;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -40,6 +40,23 @@
}
}
+ /**
+ * Remap visual node in DOM Mapping and in the VisualMap.
+ *
+ * @param visualNode old visual node
+ * @param registeredVisualNewNode node, that've been actually registered in the DOM
+ */
+ public void remapVisualNode(nsIDOMNode visualNode, nsIDOMNode registeredVisualNewNode) {
+ if ((visualNode != null) && (registeredVisualNewNode != null)) {
+ VpeNodeMapping nodeMapping = visualMap.get(visualNode);
+ if (nodeMapping != null) {
+ nodeMapping.setVisualNode(registeredVisualNewNode);
+ visualMap.remove(visualNode);
+ visualMap.put(registeredVisualNewNode, nodeMapping);
+ }
+ }
+ }
+
public void clear(nsIDOMNode except) {
Set<Map.Entry<nsIDOMNode, VpeNodeMapping>> entrySet = visualMap.entrySet();
Iterator<Map.Entry<nsIDOMNode, VpeNodeMapping>> iter = entrySet.iterator();
@@ -62,29 +79,21 @@
}
public VpeNodeMapping getNodeMappingAtSourceNode(Node sourceNode) {
+ VpeNodeMapping nodeMapping = null;
if (sourceNode != null) {
- return sourceMap.get(sourceNode);
+ nodeMapping = sourceMap.get(sourceNode);
}
-
- return null;
+ return nodeMapping;
}
public VpeNodeMapping getNodeMappingAtVisualNode(nsIDOMNode visualNode) {
VpeNodeMapping nodeMapping = null;
/*
- * See https://issues.jboss.org/browse/JBIDE-9807
- * Method map.get(key) doesn't work correctly for this situation,
- * it happens because "visualMap.keySet().contains(visualNode)"
- * not always correctly determines the "visualNode".
+ * https://issues.jboss.org/browse/JBIDE-9932
+ * Replaced with map.
*/
if (visualNode != null) {
- Iterator<Map.Entry<nsIDOMNode, VpeNodeMapping>> iter = visualMap.entrySet().iterator();
- while(iter.hasNext()) {
- Map.Entry<nsIDOMNode,VpeNodeMapping> element = iter.next();
- if (visualNode.equals(element.getKey())) {
- nodeMapping = element.getValue();
- }
- }
+ nodeMapping = visualMap.get(visualNode);
}
return nodeMapping;
}
@@ -102,7 +111,6 @@
if (nodeMapping != null) {
return nodeMapping.getSourceNode();
}
-
return null;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -33,4 +33,12 @@
public nsIDOMNode getVisualNode() {
return visualNode;
}
+
+ /**
+ * Fix for https://issues.jboss.org/browse/JBIDE-9932
+ * @param visualNode the visual node
+ */
+ public void setVisualNode(nsIDOMNode visualNode) {
+ this.visualNode = visualNode;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeRenderingTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeRenderingTemplate.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeRenderingTemplate.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -41,14 +41,11 @@
return new VpeCreationData(null);
}
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getNodeForUpdate(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode, java.lang.Object)
- */
@Override
public Node getNodeForUpdate(VpePageContext pageContext, Node sourceNode,
nsIDOMNode visualNode, Object data) {
//if rendered=false, template hasn't visual presentations
- //so we should upadte parent node
+ //so we should update parent node
return sourceNode.getParentNode();
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -645,5 +645,11 @@
}
return result;
}
+
+ @Override
+ public String toString() {
+ return "VpeTemplateSafeWrapper@" + this.hashCode() //$NON-NLS-1$
+ + " [delegate=" + delegate + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -25,12 +25,12 @@
import org.w3c.dom.NodeList;
public class SourceDomUtil {
- private static final Set<String> templatesNamespacesWithRendered=new HashSet<String>();
+ private static final Set<String> TEMPLATES_NAMESPACES_WITH_RENDERED=new HashSet<String>();
static {
- templatesNamespacesWithRendered.add("h:"); //$NON-NLS-1$
- templatesNamespacesWithRendered.add("a4j:"); //$NON-NLS-1$
- templatesNamespacesWithRendered.add("rich:"); //$NON-NLS-1$
- templatesNamespacesWithRendered.add("seam:"); //$NON-NLS-1$
+ TEMPLATES_NAMESPACES_WITH_RENDERED.add("h:"); //$NON-NLS-1$
+ TEMPLATES_NAMESPACES_WITH_RENDERED.add("a4j:"); //$NON-NLS-1$
+ TEMPLATES_NAMESPACES_WITH_RENDERED.add("rich:"); //$NON-NLS-1$
+ TEMPLATES_NAMESPACES_WITH_RENDERED.add("seam:"); //$NON-NLS-1$
}
static public Node getAncestorNode(Node sourceNode, String tagName) {
@@ -77,17 +77,17 @@
public static boolean isRenderedAttrEqFalse(VpePageContext pageContext,
Element sourceNode) {
boolean result = false;
- final String attrName = "rendered"; //$NON-NLS-1$
+ final String ATTR_RENDERED = "rendered"; //$NON-NLS-1$
Element tempElement = sourceNode;
- if (sourceNode.hasAttribute(attrName)) {
+ if (sourceNode.hasAttribute(ATTR_RENDERED)) {
if (pageContext.getElService().isELNode(sourceNode)) {
tempElement = (Element) VpeProxyUtil
.createProxyForELExpressionNode(pageContext, sourceNode);
}
- if ("false".equals(tempElement.getAttribute(attrName))) { //$NON-NLS-1$
+ if ("false".equals(tempElement.getAttribute(ATTR_RENDERED))) { //$NON-NLS-1$
String templateName = VpeTemplateManager.getInstance().getTemplateName(pageContext, sourceNode);
String [] templatePrefix = templateName.split(":"); //$NON-NLS-1$
- if(templatePrefix.length>1 && templatesNamespacesWithRendered.contains(templatePrefix[0]+":")) { //$NON-NLS-1$
+ if(templatePrefix.length>1 && TEMPLATES_NAMESPACES_WITH_RENDERED.contains(templatePrefix[0]+":")) { //$NON-NLS-1$
result = true;
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -133,7 +133,7 @@
throws DOMComparisonException {
// get element by id
nsIDOMElement vpeElement = findElementById(controller, elementId);
- assertNotNull("Cann't find element with id="+elementId,vpeElement); //$NON-NLS-1$
+ assertNotNull("Cannot find element with id="+elementId,vpeElement); //$NON-NLS-1$
// DOMTreeDumper dumper = new DOMTreeDumper(
// VpeDebug.VISUAL_DUMP_PRINT_HASH);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-12-02 12:04:51 UTC (rev 36875)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-12-02 12:43:10 UTC (rev 36876)
@@ -11,6 +11,8 @@
package org.jboss.tools.vpe.base.test;
+import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
@@ -428,18 +430,24 @@
* @param elementId
* @return
*/
- protected nsIDOMElement findElementById(VpeController controller,
- String elementId) {
-
+ protected nsIDOMElement findElementById(VpeController controller,String elementId) {
Element sourceElement = findSourceElementById(controller, elementId);
-
- VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
- sourceElement);
-
- if (nodeMapping == null)
- return null;
-
- return (nsIDOMElement) nodeMapping.getVisualNode();
+ nsIDOMElement element = null;
+ VpeNodeMapping nodeMapping = controller
+ .getDomMapping().getNodeMapping(sourceElement);
+ if (nodeMapping != null) {
+ nsIDOMNode node = nodeMapping.getVisualNode();
+ if (node != null) {
+ try {
+ element = queryInterface(node, nsIDOMElement.class);
+ } catch (org.mozilla.xpcom.XPCOMException e) {
+ //Do nothing
+ } catch (NullPointerException e) {
+ //Do nothing
+ }
+ }
+ }
+ return element;
}
protected String getEditorID(){
14 years
JBoss Tools SVN: r36875 - in trunk/vpe/plugins: org.jboss.tools.vpe.browsersim.eclipse and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-02 07:04:51 -0500 (Fri, 02 Dec 2011)
New Revision: 36875
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- changed names of browsersim actions
- set default page as about:blank
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2011-12-02 12:02:33 UTC (rev 36874)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2011-12-02 12:04:51 UTC (rev 36875)
@@ -56,7 +56,7 @@
* @author Yahor Radtsevich (yradtsevich)
*/
public class BrowserSim implements Runnable {
- private static final String DEFAULT_URL = "http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent"; //$NON-NLS-1$
+ private static final String DEFAULT_URL = "about:blank"; //"http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent"; //$NON-NLS-1$
private AbstractWebKitBrowser browser;
private Display display;
private Shell shell;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-12-02 12:02:33 UTC (rev 36874)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-12-02 12:04:51 UTC (rev 36875)
@@ -8,7 +8,7 @@
id="org.jboss.tools.vpe.browsersim.eclipse.commands.category">
</category>
<command
- name="Run BrowserSim"
+ name="Run Mobile Browser Simulator"
categoryId="org.jboss.tools.vpe.browsersim.eclipse.commands.category"
id="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim">
</command>
@@ -38,7 +38,7 @@
<command
commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim"
icon="icons/sample.gif"
- tooltip="Run BrowserSim"
+ tooltip="Run Mobile Browser Simulator"
id="org.jboss.tools.vpe.browsersim.eclipse.toolbars.runBrowserSim">
</command>
</toolbar>
@@ -59,7 +59,7 @@
executable=""
factoryclass="org.jboss.tools.vpe.browsersim.eclipse.BrowserSimFactory"
id="org.jboss.tools.vpe.browsersim.eclipse"
- name="BrowserSim"
+ name="Mobile Browser Simulator"
os="Win32,linux,MacOSX">
<location>
.
14 years
JBoss Tools SVN: r36874 - in trunk/forge/tests/org.jboss.tools.forge.ui.bot.test: src/org/jboss/tools/forge/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-12-02 07:02:33 -0500 (Fri, 02 Dec 2011)
New Revision: 36874
Modified:
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/META-INF/MANIFEST.MF
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ForgeViewTest.java
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeAllTest.java
Log:
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/META-INF/MANIFEST.MF 2011-12-02 11:53:16 UTC (rev 36873)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/META-INF/MANIFEST.MF 2011-12-02 12:02:33 UTC (rev 36874)
@@ -11,18 +11,5 @@
org.jboss.tools.forge.ui;bundle-version="1.0.0",
org.jboss.tools.forge.core;bundle-version="1.0.0",
org.jboss.tools.forge.runtime;bundle-version="1.0.0",
- org.jboss.tools.forge.runtime.ext;bundle-version="1.0.0",
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.console,
- org.eclipse.jface.text,
- org.eclipse.debug.ui,
- org.eclipse.jdt.launching,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.m2e.core;bundle-version="[1.0,2.0)",
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0,2.0)",
- org.eclipse.jdt.core,
- org.eclipse.ui.views,
- org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.eclipse.ui.navigator;bundle-version="3.5.100"
+ org.jboss.tools.forge.runtime.ext;bundle-version="1.0.0"
+
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ForgeViewTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ForgeViewTest.java 2011-12-02 11:53:16 UTC (rev 36873)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ForgeViewTest.java 2011-12-02 12:02:33 UTC (rev 36874)
@@ -22,28 +22,7 @@
public void forgeViewPresent () {
openForgeView();
assertTrue(isForgeViewActive());
-
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
-
-
+
}
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeAllTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeAllTest.java 2011-12-02 11:53:16 UTC (rev 36873)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeAllTest.java 2011-12-02 12:02:33 UTC (rev 36874)
@@ -13,8 +13,8 @@
*
*/
@SuiteClasses({
- ForgeViewTest.class
- //ProjectTest.class
+ ForgeViewTest.class,
+ ProjectTest.class
})
@RunWith(RequirementAwareSuite.class)
public class ForgeAllTest {
14 years
JBoss Tools SVN: r36873 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-02 06:53:16 -0500 (Fri, 02 Dec 2011)
New Revision: 36873
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-10048 make sure no component is only in Abridged
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-12-02 11:26:44 UTC (rev 36872)
+++ trunk/build/aggregate/site/site.xml 2011-12-02 11:53:16 UTC (rev 36873)
@@ -17,10 +17,12 @@
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="GeneralTools"/>
</feature>
<!-- only in JBT -->
<feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="GeneralTools"/>
</feature>
<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
</feature>
@@ -172,10 +174,13 @@
<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="GeneralTools"/>
</feature>
<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="GeneralTools"/>
</feature>
+
<!-- include but do not categorize -->
<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0">
</feature>
@@ -196,13 +201,16 @@
</feature>
<feature url="features/org.jboss.tools.runtime.as.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.seam.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
<category name="AbridgedTools" />
+ <category name="GeneralTools"/>
</feature>
<category-def name="AbridgedTools" label="Abridged JBoss Tools 3.3">
14 years
JBoss Tools SVN: r36872 - branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-12-02 06:26:44 -0500 (Fri, 02 Dec 2011)
New Revision: 36872
Modified:
branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/feature.png
Log:
JBIDE-10138 The ModeShape icon in Help > About is an old version.
Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/feature.png
===================================================================
(Binary files differ)
14 years
JBoss Tools SVN: r36871 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-02 05:38:30 -0500 (Fri, 02 Dec 2011)
New Revision: 36871
Modified:
trunk/build/aggregate/site/site.xml
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added the browsersim feature to the JBoss Tools main update site
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-12-02 09:56:55 UTC (rev 36870)
+++ trunk/build/aggregate/site/site.xml 2011-12-02 10:38:30 UTC (rev 36871)
@@ -37,6 +37,10 @@
<category name="AbridgedTools" />
<category name="WebTools" />
</feature>
+ <feature url="features/org.jboss.tools.vpe.browsersim.feature_0.0.0.jar" id="org.jboss.tools.vpe.browsersim.feature" version="0.0.0">
+ <category name="AbridgedTools" />
+ <category name="WebTools" />
+ </feature>
<feature url="features/org.jboss.tools.jsf.feature_0.0.0.jar" id="org.jboss.tools.jsf.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="WebTools" />
14 years