JBoss Tools SVN: r25731 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-11 12:21:36 -0400 (Mon, 11 Oct 2010)
New Revision: 25731
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-10-11 16:20:27 UTC (rev 25730)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-10-11 16:21:36 UTC (rev 25731)
@@ -393,7 +393,6 @@
ELSegment segment = resolution.getUnresolvedSegment();
if(segment==null) {
- JSFModelPlugin.getDefault().logError("No one segment was found in EL " + operand + " in " + file);
return;
}
LexicalToken token = segment.getToken();
13 years, 12 months
JBoss Tools SVN: r25730 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-11 12:20:27 -0400 (Mon, 11 Oct 2010)
New Revision: 25730
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
Log:
JBIDE-7201
SeamELContentAssist tests failures
XHTMLTemplateContentAssistComputer CA Computer's package is exported due to make it visible to WST.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2010-10-11 16:12:05 UTC (rev 25729)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2010-10-11 16:20:27 UTC (rev 25730)
@@ -10,6 +10,7 @@
org.jboss.tools.jst.web.ui.action,
org.jboss.tools.jst.web.ui.action.adf,
org.jboss.tools.jst.web.ui.attribute.adapter,
+ org.jboss.tools.jst.web.ui.editor.pref.template.contentassist,
org.jboss.tools.jst.web.ui.editors,
org.jboss.tools.jst.web.ui.editors.forms,
org.jboss.tools.jst.web.ui.editors.webapp.form,
13 years, 12 months
JBoss Tools SVN: r25729 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-11 12:12:05 -0400 (Mon, 11 Oct 2010)
New Revision: 25729
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
Log:
JBIDE-7201
SeamELContentAssist tests failures
CA Tests are fixed.
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2010-10-11 15:56:28 UTC (rev 25728)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2010-10-11 16:12:05 UTC (rev 25729)
@@ -1,5 +1,6 @@
package org.jboss.tools.seam.ui.test.ca;
+import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -282,34 +283,24 @@
assertTrue("Cannot find the starting point in the test file \"" + JAVA_FILENAME + "\"", (start != -1));
- ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+ assertTrue("Content Assistant peturned no proposals", (res != null && res.size() > 0));
+
// if (errorMessage != null && errorMessage.trim().length() > 0) {
// System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage);
// }
-
- assertTrue("Content Assistant peturned no proposals", (result != null && result.length > 0));
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Set<String> nonExistingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Set<String> filteredValidProposals = getJavaStringValidELProposals();
- for (int j = 0; j < result.length; j++) {
+ for (ICompletionProposal p : res) {
// Look only for SeamELProposalProcessor proposals
- if (result[j] instanceof ELProposalProcessor.Proposal) {
- ELProposalProcessor.Proposal proposal = (ELProposalProcessor.Proposal)result[j];
+ if (p instanceof ELProposalProcessor.Proposal) {
+ ELProposalProcessor.Proposal proposal = (ELProposalProcessor.Proposal)p;
String proposalString = proposal.getPrefixCompletionText(document, offsetToTest).toString();
if (filteredValidProposals.contains(proposalString)) {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2010-10-11 15:56:28 UTC (rev 25728)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2010-10-11 16:12:05 UTC (rev 25729)
@@ -32,6 +32,8 @@
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
+import org.jboss.tools.common.el.core.ELCorePlugin;
+import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.TestUtil;
@@ -268,6 +270,7 @@
* Test for https://jira.jboss.org/jira/browse/JBIDE-3213
*/
public void testFrameworkComponents() {
+ ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_METHODS_WITH_PARENTHESES_ONLY, false);
assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
checkProposals("/WebContent/frameworkComponents.xhtml", 698, new String[]{"fullPostList.resultList", "fullPostList.next"}, false);
}
@@ -450,6 +453,7 @@
}
public void testSeamELContentAssist() {
+ ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_METHODS_WITH_PARENTHESES_ONLY, false);
openEditor(PAGE_NAME);
List<IRegion> regionsToTest = getELRegionsToTest(document);
@@ -469,15 +473,7 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offset, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offset);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
// if (errorMessage != null && errorMessage.trim().length() > 0) {
// System.out.println("#" + offset + ": ERROR MESSAGE: " + errorMessage);
@@ -486,14 +482,14 @@
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- if (result != null && result.length > 0) {
- for (int j = 0; j < result.length; j++) {
+ if (res != null && res.size() > 0) {
+ for (ICompletionProposal p : res) {
// System.out.println("Result#" + i + "-" + j + " ==> " + result[j].getClass().getName());
// Cannot separate Seam EL proposals from all the others,
// so check only the required proposals existance
//
- if (result[j] instanceof AutoContentAssistantProposal) {
- AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[j];
+ if (p instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)p;
String proposalString = proposal.getReplacementString();
if (filteredValidProposals.contains(proposalString)) {
@@ -575,16 +571,7 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offset, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offset);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
// if (errorMessage != null && errorMessage.trim().length() > 0) {
// System.out.println("#" + offset + ": ERROR MESSAGE: " + errorMessage);
// }
@@ -592,14 +579,14 @@
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- if (result != null && result.length > 0) {
- for (int j = 0; j < result.length; j++) {
+ if (res != null && res.size() > 0) {
+ for (ICompletionProposal p : res) {
// System.out.println("Result#" + i + "/" + j + " ==> " + result[j].getClass().getName());
// Cannot separate Seam EL proposals from all the others,
// so check only the required proposals existance
//
- if (result[j] instanceof AutoContentAssistantProposal) {
- AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[j];
+ if (p instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)p;
String proposalString = proposal.getReplacementString();
if (filteredValidProposals.contains(proposalString)) {
@@ -654,20 +641,11 @@
int startOffset = region.getOffset() + 2;
int offset = startOffset + 10;
- ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offset, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offset);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
- assertNotNull("Proposals were not created.", result);
- assertEquals("Incorrect number of proposals for #{'aa'.subst|ring(1)}", 3, result.length);
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
+ assertNotNull("Proposals were not created.", res);
+ assertEquals("Incorrect number of proposals for #{'aa'.subst|ring(1)}", 3, res.size());
}
}
13 years, 12 months
JBoss Tools SVN: r25728 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-11 11:56:28 -0400 (Mon, 11 Oct 2010)
New Revision: 25728
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2010-10-11 15:53:22 UTC (rev 25727)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2010-10-11 15:56:28 UTC (rev 25728)
@@ -177,7 +177,9 @@
List<TextProposal> completions = new ArrayList<TextProposal>();
ELResolutionImpl status = resolveELOperand(file, parseOperand("" + prefix), returnEqualedVariablesOnly); //$NON-NLS-1$
- completions.addAll(status.getProposals());
+ if(status!=null) {
+ completions.addAll(status.getProposals());
+ }
return completions;
}
13 years, 12 months
JBoss Tools SVN: r25727 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-11 11:53:22 -0400 (Mon, 11 Oct 2010)
New Revision: 25727
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
Log:
[JBIDE-7306] moved Remove action to its own inner class, implemented removal of several, selected clouds
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-11 15:44:01 UTC (rev 25726)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-11 15:53:22 UTC (rev 25727)
@@ -11,6 +11,7 @@
package org.jboss.tools.deltacloud.ui.views;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -217,34 +218,7 @@
}
private void makeActions() {
- removeCloud = new Action() {
- public void run() {
- IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
- CloudViewElement element = (CloudViewElement)selection.getFirstElement();
- while (element != null && !(element instanceof CVCloudElement)) {
- element = (CloudViewElement)element.getParent();
- }
- if (element != null) {
- CVCloudElement cve = (CVCloudElement)element;
- Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
- boolean confirmed = MessageDialog.openConfirm(shell,
- CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE),
- CVMessages.getFormattedString(CONFIRM_CLOUD_DELETE_MSG, cve.getName()));
- if (confirmed) {
- DeltaCloudManager.getDefault().removeCloud((DeltaCloud)element.getElement());
- CloudViewContentProvider p = (CloudViewContentProvider)viewer.getContentProvider();
- Object[] elements = p.getElements(getViewSite());
- int index = -1;
- for (int i = 0; i < elements.length; ++i) {
- if (elements[i] == cve)
- index = i;
- }
- if (index >= 0)
- ((TreeViewer)cve.getViewer()).remove(getViewSite(), index);
- }
- }
- }
- };
+ removeCloud = new RemoveAction();
removeCloud.setText(CVMessages.getString(REMOVE_CLOUD));
removeCloud.setToolTipText(CVMessages.getString(REMOVE_CLOUD));
removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
@@ -537,4 +511,43 @@
return new CVPropertySheetPage();
return super.getAdapter(adapter);
}
+
+ /**
+ * A JFace action that removes the clouds that are selected in the tree viewer.
+ */
+ private class RemoveAction extends Action {
+
+ public void run() {
+ IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+ for (Iterator<?> iterator = selection.toList().iterator(); iterator.hasNext(); ) {
+ CloudViewElement element = (CloudViewElement) iterator.next();
+ remove(element);
+ }
+ }
+
+ private void remove(CloudViewElement element) {
+ while (element != null && !(element instanceof CVCloudElement)) {
+ element = (CloudViewElement)element.getParent();
+ }
+ if (element != null) {
+ CVCloudElement cve = (CVCloudElement)element;
+ Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
+ boolean confirmed = MessageDialog.openConfirm(shell,
+ CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE),
+ CVMessages.getFormattedString(CONFIRM_CLOUD_DELETE_MSG, cve.getName()));
+ if (confirmed) {
+ DeltaCloudManager.getDefault().removeCloud((DeltaCloud)element.getElement());
+ CloudViewContentProvider p = (CloudViewContentProvider)viewer.getContentProvider();
+ Object[] elements = p.getElements(getViewSite());
+ int index = -1;
+ for (int i = 0; i < elements.length; ++i) {
+ if (elements[i] == cve)
+ index = i;
+ }
+ if (index >= 0)
+ ((TreeViewer)cve.getViewer()).remove(getViewSite(), index);
+ }
+ }
+ }
+ }
}
\ No newline at end of file
13 years, 12 months
JBoss Tools SVN: r25726 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-11 11:44:01 -0400 (Mon, 11 Oct 2010)
New Revision: 25726
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java
Log:
[JBIDE-7306] moved default values to model
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java 2010-10-11 15:43:26 UTC (rev 25725)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java 2010-10-11 15:44:01 UTC (rev 25726)
@@ -156,6 +156,14 @@
}
}
+
+ public CloudConnectionModel(String name, String url, String username, String password) {
+ this.name = name;
+ this.url = url;
+ this.username = username;
+ this.password = password;
+ }
+
public String getUsername() {
return username;
}
13 years, 12 months
JBoss Tools SVN: r25725 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-11 11:43:26 -0400 (Mon, 11 Oct 2010)
New Revision: 25725
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
Log:
[JBIDE-7306] moved Remove action to its own inner class, implemented removal of several, selected clouds
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-11 15:09:29 UTC (rev 25724)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-11 15:43:26 UTC (rev 25725)
@@ -1,5 +1,7 @@
2010-10-11 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (getAdapter):
+ [JBIDE-7306] moved Remove action to its own inner class, implemented removal of several, selected clouds
* src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnection.java (performTest):
[JBIDE-7282] [JBIDE-7283] [JBIDE-7284] removed autogenerated comments, changed setting access to use presentation model
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-11 15:09:29 UTC (rev 25724)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-11 15:43:26 UTC (rev 25725)
@@ -75,12 +75,6 @@
private static final String MUST_ENTER_A_NAME = "ErrorMustNameConnection.text"; //$NON-NLS-1$
private static final String MUST_ENTER_A_URL = "ErrorMustProvideUrl.text"; //$NON-NLS-1$;
- private String defaultName = ""; //$NON-NLS-1$
- private String defaultUrl = ""; //$NON-NLS-1$
- private String defaultUsername = ""; //$NON-NLS-1$
- private String defaultPassword = ""; //$NON-NLS-1$
- private String defaultType = ""; //$NON-NLS-1$
-
private CloudConnectionModel connectionModel;
private CloudConnection cloudConnection;
@@ -103,7 +97,7 @@
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE);
- this.connectionModel = new CloudConnectionModel();
+ this.connectionModel = new CloudConnectionModel("", "", "", "");
this.cloudConnection = cloudConnection;
}
@@ -111,12 +105,7 @@
String defaultUsername, String defaultPassword, String defaultType,
CloudConnection cloudConnection) {
super(pageName);
- this.defaultName = defaultName;
- this.defaultUrl = defaultUrl;
- this.defaultUsername = defaultUsername;
- this.defaultPassword = defaultPassword;
- this.defaultType = defaultType;
- this.connectionModel = new CloudConnectionModel();
+ this.connectionModel = new CloudConnectionModel(defaultName, defaultUrl, defaultUsername, defaultPassword);
this.cloudConnection = cloudConnection;
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
@@ -141,7 +130,6 @@
Label nameLabel = new Label(container, SWT.NULL);
nameLabel.setText(WizardMessages.getString(NAME_LABEL));
Text nameText = new Text(container, SWT.BORDER | SWT.SINGLE);
- nameText.setText(defaultName);
bindName(dbc, nameText);
// url
@@ -149,7 +137,6 @@
urlLabel.setText(WizardMessages.getString(URL_LABEL));
Point p1 = urlLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Text urlText = new Text(container, SWT.BORDER | SWT.SINGLE);
- urlText.setText(defaultUrl);
dbc.bindValue(
WidgetProperties.text(SWT.Modify).observeDelayed(CLOUDTYPE_CHECK_DELAY, urlText),
BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_URL)
@@ -160,14 +147,12 @@
// cloud type
Label typeLabel = new Label(container, SWT.NULL);
- typeLabel.setText(defaultType);
Binding urlBinding = bindCloudTypeLabel(dbc, urlText, typeLabel);
// username
Label usernameLabel = new Label(container, SWT.NULL);
usernameLabel.setText(WizardMessages.getString(USERNAME_LABEL));
Text usernameText = new Text(container, SWT.BORDER | SWT.SINGLE);
- usernameText.setText(defaultUsername);
ControlDecoration usernameDecoration = JFaceUtils.createDecoration(usernameText, TEST_FAILURE);
IObservableValue usernameObservable = WidgetProperties.text(SWT.Modify).observe(usernameText);
dbc.bindValue(
@@ -179,7 +164,6 @@
Label passwordLabel = new Label(container, SWT.NULL);
passwordLabel.setText(WizardMessages.getString(PASSWORD_LABEL));
Text passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD | SWT.SINGLE);
- passwordText.setText(defaultPassword);
ControlDecoration passwordDecoration = JFaceUtils.createDecoration(passwordText, TEST_FAILURE);
ISWTObservableValue passwordTextObservable = WidgetProperties.text(SWT.Modify).observe(passwordText);
dbc.bindValue(
13 years, 12 months
JBoss Tools SVN: r25724 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-11 11:09:29 -0400 (Mon, 11 Oct 2010)
New Revision: 25724
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
Log:
JBIDE-7201
SeamELContentAssist tests failures
Test is fixed: testSeamELContentAssistJbide1645(org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1645Test)
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2010-10-11 14:27:59 UTC (rev 25723)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2010-10-11 15:09:29 UTC (rev 25724)
@@ -1,11 +1,15 @@
package org.jboss.tools.seam.ui.test.ca;
+import java.util.List;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.jboss.tools.common.el.core.ELCorePlugin;
+import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
import org.jboss.tools.common.el.ui.ca.ELProposalProcessor;
import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
@@ -46,6 +50,7 @@
}
public void testSeamELContentAssistJbide1645() {
+ ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_METHODS_WITH_PARENTHESES_ONLY, false);
openEditor(PAGE_NAME);
// Find start of <rich:panel> tag
@@ -63,21 +68,12 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+ assertTrue("Content Assistant peturned no proposals", (res != null && res.size() > 0));
- assertTrue("Content Assistant peturned no proposals", (result != null && result.length > 0));
-
- for (int i = 0; i < result.length; i++) {
+ for (ICompletionProposal proposal : res) {
// There should not be a proposal of type SeamELProposalProcessor.Proposal in the result
- assertFalse("Content Assistant peturned proposals of type (" + result[i].getClass().getName() + ").", (result[i] instanceof ELProposalProcessor.Proposal));
+ assertFalse("Content Assistant peturned proposals of type (" + proposal.getClass().getName() + ").", (proposal instanceof ELProposalProcessor.Proposal));
}
try {
13 years, 12 months
JBoss Tools SVN: r25723 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-11 10:27:59 -0400 (Mon, 11 Oct 2010)
New Revision: 25723
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
[JBIDE-7282] [JBIDE-7283] [JBIDE-7284] <;> removed in messages
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-11 14:27:32 UTC (rev 25722)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-11 14:27:59 UTC (rev 25723)
@@ -63,9 +63,9 @@
EC2PasswordLink.text=For EC2 use the <a href="https://console.aws.amazon.com/ec2/home">Access Secret Key</a>
ErrorNameInUse.text=Error: the name chosen is already in use
-ErrorMustNameConnection.text=You must name the connection;
-ErrorMustProvideUrl.text=You must provide an url for the cloud;
-ErrorCouldNotOpenBrowser.text=Could not open url \"{0}\"in Browser;
+ErrorMustNameConnection.text=You must name the connection
+ErrorMustProvideUrl.text=You must provide an url for the cloud
+ErrorCouldNotOpenBrowser.text=Could not open url \"{0}\"in Browser
ErrorInvalidURL.text=URL specified is invalid
ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address
ErrorInvalidPem.text=File specified is not a valid existing key
13 years, 12 months
JBoss Tools SVN: r25722 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-11 10:27:32 -0400 (Mon, 11 Oct 2010)
New Revision: 25722
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
[JBIDE-7282] [JBIDE-7283] [JBIDE-7284] typo corrected in error messages
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-11 14:26:27 UTC (rev 25721)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-11 14:27:32 UTC (rev 25722)
@@ -64,7 +64,7 @@
ErrorNameInUse.text=Error: the name chosen is already in use
ErrorMustNameConnection.text=You must name the connection;
-ErrorMustProvideUrl.text=You must provide a url for the cloud;
+ErrorMustProvideUrl.text=You must provide an url for the cloud;
ErrorCouldNotOpenBrowser.text=Could not open url \"{0}\"in Browser;
ErrorInvalidURL.text=URL specified is invalid
ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address
13 years, 12 months