JBoss Tools SVN: r41992 - trunk/build/util.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-14 17:29:40 -0400 (Thu, 14 Jun 2012)
New Revision: 41992
Modified:
trunk/build/util/checkCompiledArtifactVersions.sh
Log:
update diff script to exclude soa stuff and include hibernate better
Modified: trunk/build/util/checkCompiledArtifactVersions.sh
===================================================================
--- trunk/build/util/checkCompiledArtifactVersions.sh 2012-06-14 20:17:51 UTC (rev 41991)
+++ trunk/build/util/checkCompiledArtifactVersions.sh 2012-06-14 21:29:40 UTC (rev 41992)
@@ -15,17 +15,20 @@
basedir=.
fi
+# point at an update site to produce list of versions
+
versionlist=/tmp/versionlist; rm -fr $versionlist
-for d in tools.common tools.flow jbpm jmx archives .as bpel smooks freemarker profiler portlet modeshape xulrunner jst vpe jsf drools esb tptp ws cdi struts hibernatetools seam examples birt maven; do
+for d in tools.common jmx archives .as freemarker profiler portlet xulrunner jst vpe jsf tptp ws cdi struts hibernate seam examples birt maven; do
#echo " == $d =="
- for a in $(find $basedir -maxdepth 2 -name "*${d}*"); do
+ for a in $(find $basedir -maxdepth 3 -name "*${d}*" | sort); do
b=$a; b=${b##*/}; b=${b%.*}; b=${b%.jar};
a=${b%%_*}; a=${a//./_} # org_jboss_tools_maven_seam_feature
v=${b#*_}; v=${v:0:5}
- echo "${a}=${v}" | tee -a $versionlist
+ echo "${a}=${v}" >> $versionlist
+ #echo "${a}=${v} ($b)"
done
#echo " -- $d --"
done
echo ""
-echo "Baseline artifact version information stored in ${versionlist}."
+echo "Baseline artifact version information stored in ${versionlist}"
13 years, 10 months
JBoss Tools SVN: r41991 - in trunk: jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-06-14 16:17:51 -0400 (Thu, 14 Jun 2012)
New Revision: 41991
Added:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IBaseMarkerResolution.java
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
Log:
Quick-fixes are duplicated in VPE editor https://issues.jboss.org/browse/JBIDE-12178
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IBaseMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IBaseMarkerResolution.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IBaseMarkerResolution.java 2012-06-14 20:17:51 UTC (rev 41991)
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.text.xml.quickfix;
+
+import org.eclipse.ui.IMarkerResolution2;
+
+public interface IBaseMarkerResolution extends IMarkerResolution2 {
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IBaseMarkerResolution.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java 2012-06-14 18:55:17 UTC (rev 41990)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java 2012-06-14 20:17:51 UTC (rev 41991)
@@ -23,7 +23,11 @@
import org.eclipse.jface.text.quickassist.IQuickFixableAnnotation;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
import org.eclipse.wst.sse.ui.StructuredTextInvocationContext;
@@ -56,7 +60,9 @@
IMarker marker = annotation.getMarker();
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker);
for (IMarkerResolution resolution : resolutions) {
- proposals.add(new QuickFixProposal(resolution, marker));
+ if(!isDirty() || !(resolution instanceof IBaseMarkerResolution)){
+ proposals.add(new QuickFixProposal(resolution, marker));
+ }
}
return proposals;
@@ -74,7 +80,8 @@
}
// get all relevant quick fixes for this annotation
- if(QuickFixManager.getInstance().hasProposals(annotation)){
+
+ if(isDirty() && QuickFixManager.getInstance().hasProposals(annotation)){
annotation.setAdditionalFixInfo(viewer.getDocument());
List<ICompletionProposal> proposals = QuickFixManager.getInstance().getProposals(annotation);
allProposals.addAll(proposals);
@@ -103,6 +110,20 @@
return allProposals;
}
+ private static boolean isDirty(){
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if(window != null){
+ IWorkbenchPage page = window.getActivePage();
+ if(page != null){
+ IEditorPart editor = page.getActiveEditor();
+ if(editor != null){
+ return editor.isDirty();
+ }
+ }
+ }
+ return true;
+ }
+
private void collectProposals(IQuickAssistProcessor processor, Annotation annotation, IQuickAssistInvocationContext invocationContext, List<ICompletionProposal> proposalsList) {
ICompletionProposal[] proposals = processor.computeQuickAssistProposals(invocationContext);
if (proposals != null && proposals.length > 0) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-06-14 18:55:17 UTC (rev 41990)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-06-14 20:17:51 UTC (rev 41991)
@@ -31,6 +31,7 @@
import org.eclipse.ui.texteditor.DocumentProviderRegistry;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
+import org.jboss.tools.common.text.xml.quickfix.IBaseMarkerResolution;
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper;
import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteTaglibInserter;
import org.jboss.tools.jst.web.ui.Messages;
@@ -42,7 +43,7 @@
* @author Daniel Azarov
*
*/
-public class AddTLDMarkerResolution implements IMarkerResolution2, ICompletionProposal{
+public class AddTLDMarkerResolution implements IBaseMarkerResolution, ICompletionProposal{
private IFile file;
private Properties properties;
@@ -75,15 +76,20 @@
IDocumentProvider provider = DocumentProviderRegistry.getDefault().getDocumentProvider(input);
try {
provider.connect(input);
+
+ boolean dirty = provider.canSaveDocument(input);
IDocument document = provider.getDocument(input);
PaletteTaglibInserter inserter = new PaletteTaglibInserter();
inserter.inserTaglib(document, properties);
- provider.aboutToChange(input);
- provider.saveDocument(new NullProgressMonitor(), input, document, true);
- provider.changed(input);
+ if(!dirty){
+ provider.aboutToChange(input);
+ provider.saveDocument(new NullProgressMonitor(), input, document, true);
+ provider.changed(input);
+ }
+
provider.disconnect(input);
}catch(CoreException ex){
WebUiPlugin.getPluginLog().logError(ex);
13 years, 10 months
JBoss Tools SVN: r41990 - workspace/jdoyle/teiid-designer.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-06-14 14:55:17 -0400 (Thu, 14 Jun 2012)
New Revision: 41990
Modified:
workspace/jdoyle/teiid-designer/StateServiceExampleProject.zip
Log:
TEIIDDES-1393 Convert State Service Example to Reflect New Importer. Updated project zip file and committed to repository location jbosstools/workspace/jdoyle/teiid-designer/ to replace last version.
Modified: workspace/jdoyle/teiid-designer/StateServiceExampleProject.zip
===================================================================
(Binary files differ)
13 years, 10 months
JBoss Tools SVN: r41989 - workspace/dgolovin.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-14 14:35:25 -0400 (Thu, 14 Jun 2012)
New Revision: 41989
Added:
workspace/dgolovin/new-releng-3.8/
Log:
development TP for Eclipse 3.8
13 years, 10 months
JBoss Tools SVN: r41988 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-06-14 12:16:50 -0400 (Thu, 14 Jun 2012)
New Revision: 41988
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
Log:
https://issues.jboss.org/browse/JBIDE-8062 - Cannot properly edit value of <f:selectItem> tag via Visual Editor
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml 2012-06-14 16:16:50 UTC (rev 41988)
@@ -1,10 +1,10 @@
<tests>
<test id="selectItem1">
- <SPAN>
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL CLASS="myClass1">check1</LABEL>
- </SPAN>
+ </DIV>
</test>
<test id="selectItem2">
<OPTION> value1</OPTION>
@@ -58,9 +58,9 @@
</DIV>
</test>
<test id="selectItem4">
- <SPAN >
+ <DIV>
<INPUT TYPE="checkbox" DIR="ltr" />
<LABEL CLASS="myClass">check1</LABEL>
- </SPAN>
+ </DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml 2012-06-14 16:16:50 UTC (rev 41988)
@@ -1,9 +1,9 @@
<tests>
<test id="selectItems1">
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox"/>
<LABEL>someValue</LABEL>
- </SPAN>
+ </DIV>
</test>
<test id="selectItems2">
<OPTION>someValue</OPTION>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2012-06-14 16:16:50 UTC (rev 41988)
@@ -4,26 +4,26 @@
<TABLE>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL> check1 </LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL> check2 </LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check3</LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
</TABLE>
@@ -34,25 +34,25 @@
<TABLE BORDER="2" STYLE="color: red;" CLASS="myClass">
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check1</LABEL>
- </SPAN>
+ </DIV>
</TD>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check2</LABEL>
- </SPAN>
+ </DIV>
</TD>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check3</LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml 2012-06-14 16:16:50 UTC (rev 41988)
@@ -1,6 +1,6 @@
<tests>
<test id="id1">
- <DIV STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="radio" NAME="radio_name_394"/>
<LABEL>
Only Once
@@ -13,11 +13,11 @@
</OPTION>
</test>
<test id="id3">
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>
Only Once
</LABEL>
- </SPAN>
+ </DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-06-14 16:16:50 UTC (rev 41988)
@@ -146,6 +146,7 @@
import org.mozilla.interfaces.nsIDOMMutationEvent;
import org.mozilla.interfaces.nsIDOMNSUIEvent;
import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMRange;
import org.mozilla.interfaces.nsIDOMWindow;
import org.mozilla.interfaces.nsIDOMWindowInternal;
import org.mozilla.interfaces.nsISelection;
@@ -884,7 +885,30 @@
VpeDebugUtil.printVisualEvent(mutationEvent);
}
}
-
+
+ private String getVisualSelectionText(nsISelection selection) {
+ String result = null;
+ if (selection != null && selection.getRangeCount() > 0) {
+ nsIDOMRange firstSelectedRange = selection.getRangeAt(0);
+ nsIDOMNode selectedNode = selection.getFocusNode();
+ if (selectedNode.getNodeName().equals("#text")) { //$NON-NLS-1$
+ int startOffset = firstSelectedRange.getStartOffset();
+ int endOffset = firstSelectedRange.getEndOffset();
+ int beginIndex, endIndex;
+ if (startOffset > endOffset) {
+ beginIndex = endOffset;
+ endIndex = startOffset;
+ } else {
+ beginIndex = startOffset;
+ endIndex = endOffset;
+ }
+ result = selectedNode.getNodeValue()
+ .substring(beginIndex, endIndex);
+ }
+ }
+ return result;
+ }
+
public void notifySelectionChanged(nsIDOMDocument doc,
nsISelection selection, short reason) {
if (!visualSelectionIsAlreadyInProgress) {
@@ -911,8 +935,19 @@
* <select> node to be selected on the first click.
*/
if (node != null) {
+ int anchorOffset = selection.getAnchorOffset();
+ int focusOffset = selection.getFocusOffset();
+ /*
+ * https://issues.jboss.org/browse/JBIDE-8062
+ * Correct automatic selection after several clicks
+ * in the mozilla editor.
+ */
+ String text = getVisualSelectionText(selection);
+ if (text == null || text.length() == 0) {
+ focusOffset = anchorOffset;
+ }
selectionManager.setSelection(SelectionUtil.getSelectedNode(selection),
- selection.getFocusOffset(), selection.getAnchorOffset());
+ focusOffset, anchorOffset);
}
}
// enables cursor on selection event
@@ -1764,13 +1799,13 @@
visualBuilder.rebuildDom(null);
}
// reinits selection controller+ controller
- visualSelectionController = new VpeSelectionController(visualEditor
- .getEditor().getSelectionController());
-
+ visualSelectionController = new VpeSelectionController(
+ visualEditor.getEditor().getSelectionController());
+
visualSelectionController.setSelectionFlags(nsISelectionDisplay.DISPLAY_ALL);
-
- selectionManager = new SelectionManager(pageContext, sourceEditor,
- visualSelectionController);
+
+ selectionManager = new SelectionManager(
+ pageContext, sourceEditor, visualSelectionController);
// selection should be restored after full refresh
selectionManager.refreshVisualSelection();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2012-06-14 15:57:24 UTC (rev 41987)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2012-06-14 16:16:50 UTC (rev 41988)
@@ -125,7 +125,7 @@
refreshVisualNodeSelection();
setUpdateSelectionEventFlag(false);
}
-
+
private SelectionData getSelectionData(nsIDOMNode visualNode) {
// get element mapping
VpeNodeMapping nodeMapping = VpeNodesManagingUtil.getNodeMapping(
@@ -227,9 +227,9 @@
if (range == null) {
return;
}
-
VpeNodeMapping nodeMapping = SelectionUtil
- .getNodeMappingBySourceSelection(getSourceEditor(), getDomMapping());
+ .getNodeMappingBySourceSelection(
+ getSourceEditor(), getDomMapping());
if (nodeMapping == null) {
return;
}
13 years, 10 months
JBoss Tools SVN: r41987 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf: ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-14 11:57:24 -0400 (Thu, 14 Jun 2012)
New Revision: 41987
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-12177
autocompletion is broken in visual editor
JUnit Test is added for the issue: org.jboss.tools.jsf.jsp.ca.test.CAJsfPredictiveTagNameProposalsTest.
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java 2012-06-14 15:57:24 UTC (rev 41987)
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import java.util.List;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
+import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+/**
+ * The JUnit test case for issue JBIDE-12177
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class CAJsfPredictiveTagNameProposalsTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs";
+ private static final String PAGE_NAME = "WebContent/pages/inputname.xhtml";
+
+ private static final String INSERT_BEFORE = "</ui:composition>";
+ private static final String INSERTION = "<define";
+ private static final String PROPOSAL_TO_APPLY = "ui:define";
+
+ private TestProjectProvider provider = null;
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
+ project = provider.getProject();
+ }
+
+ public void testJsfPredictiveTagNameProposals() {
+ assertNotNull("Test project '" + PROJECT_NAME + "' is not prepared", project);
+
+ openEditor(PAGE_NAME);
+ try {
+ // Find start of <ui:composition> tag
+ String documentContent = document.get();
+
+ int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE));
+ assertFalse("Required text '" + INSERT_BEFORE + "' not found in document", (start == -1));
+
+ String newDocumentContent = documentContent.substring(0, start) +
+ INSERTION + ' ' + documentContent.substring(start);
+
+ int offsetToTest = start + INSERTION.length();
+
+ // Update the document with a new text
+ document.set(newDocumentContent);
+ JobUtils.waitForIdle();
+
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0));
+
+ String replacementString = null;
+ boolean bPropoosalToApplyFound = false;
+ for (ICompletionProposal p : res) {
+ if (!(p instanceof AutoContentAssistantProposal))
+ continue;
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)p;
+ String proposalString = proposal.getReplacementString();
+
+ if (proposalString != null && proposalString.startsWith(PROPOSAL_TO_APPLY)) {
+ bPropoosalToApplyFound = true;
+ replacementString = proposal.getReplacementString();
+ proposal.apply(document);
+ break;
+ }
+ }
+ assertTrue("The proposal to apply not found.", bPropoosalToApplyFound && replacementString != null);
+
+ JobUtils.waitForIdle();
+
+ String documentUpdatedContent = document.get();
+ // Make the document text to compare
+ String documentContentToCompare = newDocumentContent.substring(0, start + 1) +
+ replacementString + newDocumentContent.substring(start + INSERTION.length());
+
+ assertTrue("The proposal replacement is failed.", documentContentToCompare.equals(documentUpdatedContent));
+ } finally {
+ closeEditor();
+ }
+ }
+
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-14 15:28:31 UTC (rev 41986)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-14 15:57:24 UTC (rev 41987)
@@ -31,6 +31,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CAJsfAddInfoInELMessagesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsFilteringTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAJsfPredictiveTagNameProposalsTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfResourceBundlePropertyApplyTest;
import org.jboss.tools.jsf.jsp.ca.test.CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test;
import org.jboss.tools.jsf.jsp.ca.test.CASuggestsNotOnlyELProposalsJBIDE2437Test;
@@ -176,6 +177,11 @@
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CAJsfPredictiveTagNameProposalsTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
+ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+
return suite;
}
}
\ No newline at end of file
13 years, 10 months
JBoss Tools SVN: r41986 - in trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test: suite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2012-06-14 11:28:31 -0400 (Thu, 14 Jun 2012)
New Revision: 41986
Modified:
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java
Log:
* Forge tests bot fixes.
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-06-14 15:07:12 UTC (rev 41985)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-06-14 15:28:31 UTC (rev 41986)
@@ -24,6 +24,7 @@
getStyledText().setText("persistence setup\n");
getStyledText().setText("HIBERNATE\n");
getStyledText().setText("JBOSS_AS7\n");
+ getStyledText().setText("\n"); //accept default java-ee-spec
getStyledText().setText("N\n");
assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3));
@@ -48,11 +49,13 @@
@Test
public void openjpaJBossAS7(){
+
createProject();
getStyledText().setText("persistence setup\n");
getStyledText().setText("OPENJPA\n");
getStyledText().setText("JBOSS_AS7\n");
+ getStyledText().setText("\n"); //accept default java-ee-spec
getStyledText().setText("N\n");
assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3));
@@ -73,11 +76,13 @@
@Test
public void eclipselinkJBossAS7(){
+
createProject();
getStyledText().setText("persistence setup\n");
getStyledText().setText("ECLIPSELINK\n");
getStyledText().setText("JBOSS_AS7\n");
+ getStyledText().setText("\n"); //accept default java-ee-spec
getStyledText().setText("N\n");
assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3));
@@ -99,11 +104,13 @@
@Test
public void infinispanJBossAS7(){
+
createProject();
getStyledText().setText("persistence setup\n");
getStyledText().setText("INFINISPAN\n");
getStyledText().setText("JBOSS_AS7\n");
+ getStyledText().setText("\n"); //accept default java-ee-spec
getStyledText().setText("N\n");
assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3));
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-06-14 15:07:12 UTC (rev 41985)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-06-14 15:28:31 UTC (rev 41986)
@@ -53,7 +53,6 @@
getStyledText().setText("Y\n");
ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3);
-
util.waitForNonIgnoredJobs();
}
@@ -66,7 +65,6 @@
getStyledText().setText("Y\n");
ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3);
-
util.waitForNonIgnoredJobs();
}
@@ -75,9 +73,11 @@
getStyledText().setText("persistence setup\n");
getStyledText().setText("HIBERNATE\n");
getStyledText().setText("JBOSS_AS7\n");
+ getStyledText().setText("\n"); //accept default java-ee-spec
getStyledText().setText("N\n");
ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3);
+ util.waitForNonIgnoredJobs();
}
@@ -168,6 +168,8 @@
if(!isForgeViewActive())
openForgeView();
+ if(isForgeRunning())
+ return;
SWTBotView view = getForgeView();
view.toolbarButton("Start the default Forge runtime").click();
13 years, 10 months
JBoss Tools SVN: r41985 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-14 11:07:12 -0400 (Thu, 14 Jun 2012)
New Revision: 41985
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
Log:
JBIDE-12177
autocompletion is broken in visual editor
Issue is fixed in trunk
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-06-14 15:06:29 UTC (rev 41984)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-06-14 15:07:12 UTC (rev 41985)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2011 Red Hat, Inc.
+ * Copyright (c) 2010-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -359,9 +359,11 @@
continue; // Don't query proposals for the default value here
String possibleURI = namespace.getURI();
- String possibleQuery = namespace.getPrefix() + ":" + query; //$NON-NLS-1$
+ if (possibleURI == null || possibleURI.length() == 0)
+ continue;
+
addTagNameProposalsForPrefix(contentAssistRequest, childPosition,
- possibleQuery, possiblePrefix, possibleURI,
+ query, possiblePrefix, possibleURI,
TextProposal.R_TAG_INSERTION - 1,
insertTagOpenningCharacter);
}
@@ -379,9 +381,14 @@
boolean insertTagOpenningCharacter) {
if (query == null)
query = ""; //$NON-NLS-1$
- String stringQuery = "<" + query; //$NON-NLS-1$
-
- KbQuery kbQuery = createKbQuery(Type.TAG_NAME, query, stringQuery, prefix, uri);
+
+ StringBuffer stringQuery = new StringBuffer();
+ if (query.indexOf(':') == -1 && prefix != null && prefix.length() > 0) {
+ stringQuery.append(prefix).append(':');
+ }
+ stringQuery.append(query);
+
+ KbQuery kbQuery = createKbQuery(Type.TAG_NAME, stringQuery.toString(), '<' + stringQuery.toString(), prefix, uri);
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext(), true);
for (int i = 0; proposals != null && i < proposals.length; i++) {
13 years, 10 months
JBoss Tools SVN: r41984 - trunk/requirements/jbeap-6.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-14 11:06:29 -0400 (Thu, 14 Jun 2012)
New Revision: 41984
Modified:
trunk/requirements/jbeap-6/build.properties
Log:
use released/JBEAP-6/6.0.0/zip/ instead of devel/candidates/JBEAP/JBEAP-6.0.0/ for EAP 6.0.0.GA
Modified: trunk/requirements/jbeap-6/build.properties
===================================================================
--- trunk/requirements/jbeap-6/build.properties 2012-06-14 14:56:18 UTC (rev 41983)
+++ trunk/requirements/jbeap-6/build.properties 2012-06-14 15:06:29 UTC (rev 41984)
@@ -2,7 +2,8 @@
# This property used to override URI outside the build
# It is usefull to make build work on build server vithout VPN access
-jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0/
+#jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0/
+jbeap60.build.uri=http://download.devel.redhat.com/released/JBEAP-6/6.0.0/zip/
build.uri=${jbeap60.build.uri}
jbeap60.build.archive=jboss-eap-6.0.0.zip
build.archive=${jbeap60.build.archive}
13 years, 10 months
JBoss Tools SVN: r41983 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test: resources/projects/fullyQualified2/src/cdi/seam and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-06-14 10:56:18 -0400 (Thu, 14 Jun 2012)
New Revision: 41983
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified1/src/cdi/seam/Manager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified2/src/cdi/seam/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified3/src/cdi/seam/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified4/src/cdi/seam/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified5/src/cdi/seam/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified6/src/cdi/seam/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified7/src/cdi/seam/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
Log:
FullyQualifiedTest is now tested against Seam 3.1.0
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified1/src/cdi/seam/Manager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified1/src/cdi/seam/Manager.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified1/src/cdi/seam/Manager.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -1,6 +1,6 @@
package cdi.seam;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
@FullyQualified
public class Manager {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified2/src/cdi/seam/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified2/src/cdi/seam/package-info.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified2/src/cdi/seam/package-info.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -1,2 +1,2 @@
-(a)org.jboss.seam.solder.core.FullyQualified
-package cdi.seam;
\ No newline at end of file
+(a)org.jboss.solder.core.FullyQualified
+package cdi.seam;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified3/src/cdi/seam/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified3/src/cdi/seam/MyBean1.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified3/src/cdi/seam/MyBean1.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
@FullyQualified(cdi.test.MyBean2.class) @Named
public class MyBean1 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified4/src/cdi/seam/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified4/src/cdi/seam/MyBean1.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified4/src/cdi/seam/MyBean1.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
@FullyQualified(cdi.test.MyBean1.class) @Named
public class MyBean1 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified5/src/cdi/seam/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified5/src/cdi/seam/MyBean1.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified5/src/cdi/seam/MyBean1.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
@FullyQualified @Named("bean")
public class MyBean1 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified6/src/cdi/seam/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified6/src/cdi/seam/MyBean1.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified6/src/cdi/seam/MyBean1.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -3,7 +3,7 @@
import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
public class MyBean1 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified7/src/cdi/seam/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified7/src/cdi/seam/MyBean1.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/fullyQualified7/src/cdi/seam/MyBean1.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -3,7 +3,7 @@
import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
public class MyBean1 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-14 14:37:21 UTC (rev 41982)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-14 14:56:18 UTC (rev 41983)
@@ -40,7 +40,7 @@
String projectName = "fullyQualified1";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -57,7 +57,7 @@
String projectName = "fullyQualified2";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -83,7 +83,7 @@
String projectName = "fullyQualified3";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -104,7 +104,7 @@
String projectName = "fullyQualified4";
String myBean1 = "MyBean1.java";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), myBean1).toTextEditor());
@@ -129,7 +129,7 @@
String projectName = "fullyQualified5";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -166,7 +166,7 @@
String projectName = "fullyQualified6";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -222,7 +222,7 @@
String projectName = "fullyQualified7";
- importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS).toTextEditor());
13 years, 10 months