JBoss Tools SVN: r35542 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-11 11:49:35 -0400 (Tue, 11 Oct 2011)
New Revision: 35542
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
Log:
Updated Label Providers in order to look similar https://issues.jboss.org/browse/JBIDE-9801
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -13,6 +13,13 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanField;
+import org.jboss.tools.cdi.core.IBeanMember;
+import org.jboss.tools.cdi.core.IBeanMethod;
+import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInitializerMethod;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.internal.core.impl.AbstractBeanElement;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -75,5 +82,34 @@
return sb.toString();
}
+
+ public static String getCDIElementKind(ICDIElement element){
+ if(element instanceof IBean){
+ return getBeanKind((IBean)element);
+ }else if(element instanceof IInjectionPoint){
+ return "Injection Point";
+ }else if(element instanceof IInitializerMethod){
+ return "Injection Point";
+ }else if(element instanceof IBeanMethod){
+ return "Bean Method";
+ }else if(element instanceof IBeanField){
+ return "Bean Field";
+ }else if(element instanceof IParameter){
+ return "Parameter";
+
+ }
+ return null;
+ }
+
+ public static String getCDIElementLocation(ICDIElement element, boolean includeElementName){
+ if(element instanceof IBean){
+ return getBeanLocation((IBean)element, includeElementName);
+ }else if(element instanceof IInjectionPoint){
+ return getBeanLocation(((IInjectionPoint) element).getBean(), includeElementName);
+ }else if(element instanceof IBeanMember){
+ return getBeanLocation(((IBeanMember) element).getClassBean(), includeElementName);
+ }
+ return null;
+ }
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -17,10 +17,8 @@
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
-import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
@@ -84,17 +82,4 @@
public Set<? extends ICDIElement> getCDIElements() {
return null;
}
-
- public String getFullyQualifiedName() {
- return event.getClassBean().getBeanClass().getFullyQualifiedName();
- }
-
- public String getInformation() {
- return event.getElementName();
- }
-
- public Image getImage() {
- return CDIImages.getImageByElement(event);
- }
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -10,28 +10,15 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext.hyperlink;
-import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.cdi.core.ICDIElement;
public interface IInformationItem {
/**
- * Returns the simple name of item
+ * Returns CDI element
*
* @return
*/
- public String getInformation();
+ public ICDIElement getCDIElement();
- /**
- * Returns the java element fully qualified name
- *
- * @return
- */
- public String getFullyQualifiedName();
-
- /**
- * Returns the icon image
- *
- * @return
- */
- public Image getImage();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -17,14 +17,10 @@
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
-import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
-import org.jboss.tools.cdi.core.IDecorator;
-import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.util.BeanPresentationUtil;
@@ -114,17 +110,4 @@
public Set<? extends ICDIElement> getCDIElements() {
return null;
}
-
- public String getFullyQualifiedName() {
- return bean.getBeanClass().getFullyQualifiedName();
- }
-
- public String getInformation() {
- return bean.getElementName();
- }
-
- public Image getImage() {
- return CDIImages.getImageByElement(bean);
- }
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -17,10 +17,8 @@
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
-import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
@@ -75,17 +73,4 @@
public Set<? extends ICDIElement> getCDIElements() {
return null;
}
-
- public String getFullyQualifiedName() {
- return observerMethod.getClassBean().getBeanClass().getFullyQualifiedName();
- }
-
- public String getInformation() {
- return observerMethod.getElementName();
- }
-
- public Image getImage() {
- return CDIImages.getImageByElement(observerMethod);
- }
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -32,6 +32,9 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.dialogs.SearchPattern;
+import org.jboss.tools.cdi.core.CDIImages;
+import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.util.BeanPresentationUtil;
import org.jboss.tools.cdi.text.ext.hyperlink.IInformationItem;
/**
@@ -144,13 +147,13 @@
Object element) {
if (element instanceof IInformationItem) {
- String information = ((IInformationItem)element).getInformation();
+ String name = ((IInformationItem)element).getCDIElement().getElementName();
if(getFilterText().getText().isEmpty()){
patternMatcher.setPattern("*");
}else{
patternMatcher.setPattern(getFilterText().getText());
}
- return patternMatcher.matches(information);
+ return patternMatcher.matches(name);
}else
return true;
}
@@ -199,11 +202,11 @@
StyledString sb = new StyledString();
if(element instanceof IHyperlink){
if(element instanceof IInformationItem){
- String info = ((IInformationItem)element).getInformation();
- String qualifiedName = ((IInformationItem)element).getFullyQualifiedName();
- String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf("."));
- sb.append(info, NAME_STYLE);
- sb.append(" - ", PACKAGE_STYLE).append(packageName, PACKAGE_STYLE);
+ ICDIElement cdiElement = ((IInformationItem)element).getCDIElement();
+ String name = cdiElement.getElementName();
+ String location = BeanPresentationUtil.getCDIElementLocation(cdiElement, false);
+ sb.append(name, NAME_STYLE);
+ sb.append(location, PACKAGE_STYLE);
}else{
sb.append(((IHyperlink)element).getHyperlinkText(), NAME_STYLE);
}
@@ -213,7 +216,8 @@
public Image getImage(Object element) {
if(element instanceof IInformationItem){
- return ((IInformationItem)element).getImage();
+ ICDIElement cdiElement = ((IInformationItem)element).getCDIElement();
+ return CDIImages.getImageByElement(cdiElement);
}
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -40,6 +40,7 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.util.BeanPresentationUtil;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.common.java.IParametedType;
@@ -170,16 +171,12 @@
public String getText(Object element) {
if(element instanceof CDIElementWrapper){
ICDIElement cdiElement = ((CDIElementWrapper)element).getCDIElement();
- String label = ((CDIElementWrapper)element).getLabel();
-
- if(cdiElement instanceof IInjectionPointField){
- return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_FIELD, label);
- }else if(cdiElement instanceof IInitializerMethod){
- //It is not an injection point, but it has annotation @Inject and contains injection point parameters
- return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_METHOD, label);
- }else if(cdiElement instanceof IInjectionPointParameter){
- return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_PARAMETER, label);
+ String kind = BeanPresentationUtil.getCDIElementKind(cdiElement);
+ String text = "";
+ if(kind != null){
+ text = kind+" ";
}
+ return text+cdiElement.getElementName()+BeanPresentationUtil.getCDIElementLocation(cdiElement, false);
}
return ""; //$NON-NLS-1$
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-10-11 15:35:17 UTC (rev 35541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-10-11 15:49:35 UTC (rev 35542)
@@ -12,16 +12,10 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDIImages;
-import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
-import org.jboss.tools.cdi.core.IInitializerMethod;
-import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.core.util.BeanPresentationUtil;
public class InjectionPointLabelProvider implements ILabelProvider {
@@ -35,20 +29,14 @@
public String getText(Object element) {
if(element instanceof CDIElementWrapper){
ICDIElement cdiElement = ((CDIElementWrapper)element).getCDIElement();
- String label = ((CDIElementWrapper)element).getLabel();
- if(cdiElement instanceof IBean){
- return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_INJECT_BEAN, label);
- }else if(cdiElement instanceof IObserverMethod){
- return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_OBSERVER_METHOD, label);
- }else if(cdiElement instanceof IInjectionPointField){
- return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
- }else if(cdiElement instanceof IInitializerMethod){
- return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
- }else if(cdiElement instanceof IInjectionPointParameter){
- return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
+ String kind = BeanPresentationUtil.getCDIElementKind(cdiElement);
+ String text = "";
+ if(kind != null){
+ text = kind+" ";
}
+ return text+cdiElement.getElementName()+BeanPresentationUtil.getCDIElementLocation(cdiElement, false);
}
- return ""; //$NON-NLS-1$
+ return ""; //$NON-NLS-1$
}
public void addListener(ILabelProviderListener listener) {
13 years, 3 months
JBoss Tools SVN: r35541 - trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-10-11 11:35:17 -0400 (Tue, 11 Oct 2011)
New Revision: 35541
Modified:
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java
Log:
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2011-10-11 15:29:57 UTC (rev 35540)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2011-10-11 15:35:17 UTC (rev 35541)
@@ -51,7 +51,7 @@
wiz = open.newObject(ActionItem.NewObject.GeneralFile.LABEL);
wiz.tree().select(Properties.PROJECT_NAME);
- wiz.textWithLabel(ActionItem.NewObject.GeneralFile.TEXT_FILE_NAME).typeText(Properties.FILE_NAME);
+ wiz.textWithLabel(ActionItem.NewObject.GeneralFile.TEXT_FILE_NAME).setText(Properties.FILE_NAME);
open.finish(wiz);
assertTrue(projectExplorer.isFilePresent(Properties.PROJECT_NAME, Properties.FILE_NAME));
@@ -97,9 +97,9 @@
SWTBotShell shell = bot.shell("New Server");
shell.activate();
- shell.bot().textWithLabel("URL:").typeText(Properties.URL);
- shell.bot().textWithLabel("User:").typeText(Properties.USER);
- shell.bot().textWithLabel("Password:").typeText(Properties.PASSWORD);
+ shell.bot().textWithLabel("URL:").setText(Properties.URL);
+ shell.bot().textWithLabel("User:").setText(Properties.USER);
+ shell.bot().textWithLabel("Password:").setText(Properties.PASSWORD);
shell.bot().button("Test").click();
shell = bot.shell("Test Server Connection");
13 years, 3 months
JBoss Tools SVN: r35540 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 11:29:57 -0400 (Tue, 11 Oct 2011)
New Revision: 35540
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/DomainWizardPage.java
Log:
[JBIDE-9793] cleanup: removed commented code, removed sys.err output
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/DomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/DomainWizardPage.java 2011-10-11 14:56:00 UTC (rev 35539)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/DomainWizardPage.java 2011-10-11 15:29:57 UTC (rev 35540)
@@ -74,10 +74,8 @@
@Override
public IStatus validate(Object value) {
if (!(value instanceof IDomain)) {
- System.err.println("domain validator: domain is NOT present!!!!!!!!!!!!!");
return ValidationStatus.info("You have no domain yet, you need to create one.");
}
- System.err.println("domain validator: domain is present");
return ValidationStatus.ok();
}
}));
@@ -121,7 +119,6 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
- System.err.println("running job " + this);
try {
model.renameDomain();
return Status.OK_STATUS;
@@ -145,7 +142,6 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
- System.err.println("running job " + this);
try {
model.updateDomain();
return Status.OK_STATUS;
13 years, 3 months
JBoss Tools SVN: r35539 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 10:56:00 -0400 (Tue, 11 Oct 2011)
New Revision: 35539
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java
Log:
[JBIDE-9793] cleanup: removed commented code, removed sys.err output
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java 2011-10-11 14:55:23 UTC (rev 35538)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java 2011-10-11 14:56:00 UTC (rev 35539)
@@ -45,7 +45,8 @@
* Creates a wizard page support that will not validate for the given status
* mask (severity).
*
- * @param nonValidatingSeverity the status severity mask that will not validate
+ * @param nonValidatingSeverity
+ * the status severity mask that will not validate
* @param wizardPage
* the wizardpage to apply this support to
* @param dbc
@@ -63,7 +64,8 @@
if (currentStatusStale) {
pageComplete = false;
} else if (currentStatus != null) {
- pageComplete = !((nonValidatingSeverity | currentStatus.getSeverity()) == nonValidatingSeverity);
+ pageComplete = !(
+ (nonValidatingSeverity | currentStatus.getSeverity()) == nonValidatingSeverity);
}
((WizardPage) getDialogPage()).setPageComplete(pageComplete);
}
13 years, 3 months
JBoss Tools SVN: r35538 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: src/org/jboss/tools/bpel/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-10-11 10:55:23 -0400 (Tue, 11 Oct 2011)
New Revision: 35538
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java
Log:
Enhancements and refactoring of BPEL bot tests
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-10-11 14:55:23 UTC (rev 35538)
@@ -5,7 +5,7 @@
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
#SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as
-SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
+SERVER=SOA,5.2,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
#<seam version>,<seam runtime home>
#SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam
#<esb versoin>,<esb runtime home>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -31,7 +31,7 @@
import org.junit.Before;
import org.junit.Test;
-@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class AssignActivityTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -26,7 +26,7 @@
* @author psrna
*
*/
-@Require(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+@Require(server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class OdeDeployTest extends BPELTest {
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -21,7 +21,7 @@
import org.junit.Before;
import org.junit.Test;
-@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present))
+@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present, version = "5.2"))
public class SimpleModelingTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -1,31 +1,18 @@
package org.jboss.tools.bpel.ui.bot.test;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-import static org.eclipse.swtbot.swt.finder.waits.Conditions.waitForWidget;
-
-import java.awt.event.ComponentEvent;
-import java.util.ArrayList;
import java.util.List;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
-import org.eclipse.swtbot.swt.finder.results.Result;
-import org.eclipse.swtbot.swt.finder.utils.MessageFormat;
-import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
-import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyList.ListElement;
import org.hamcrest.Matcher;
-import org.hamcrest.SelfDescribing;
import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor;
import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest;
import org.jboss.tools.bpel.ui.bot.test.util.CompositeControl;
@@ -38,12 +25,17 @@
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.PropertiesView;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-
-@Require(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+/**
+ * Tests that verify JBoss BPEL tooling and Eclipse BPEL tooling compatibility.
+ * @author psrna
+ *
+ */
+@Require(server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class ToolingCompatibilityTest extends BPELTest{
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
@@ -67,10 +59,10 @@
ResourceHelper.importProject(BUNDLE, "/projects/eclipse_tooling_proj", "eclipse_tooling_proj");
bot.viewByTitle("Project Explorer").setFocus();
}
+
-
@Test
- public void deployEclipseProjectTest(){
+ public void deployProjectTest(){
String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
// Publish the process
@@ -86,7 +78,7 @@
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
server.expand();
bot.sleep(TIME_5S);
- assertTrue(server.getNode("eclipse_tooling_proj [Started, Synchronized]").isVisible());
+ assertTrue(server.getNode("eclipse_tooling_proj [Synchronized]").isVisible());
}
@Test
@@ -104,11 +96,10 @@
Assert.assertTrue(response.contains("</HelloWorldResponse>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Body>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Envelope>"));
-
}
- @SuppressWarnings({ "static-access", "restriction" })
+ @SuppressWarnings({ "restriction" })
@Test
public void simpleEditingTest() throws Exception {
@@ -141,14 +132,11 @@
pView.bot().styledText().setText("concat('Hello ', $input.payload/tns:input)");
log.info("Save");
bpel.save();
- bot.sleep(TIME_5S);
+ bot.sleep(TIME_20S);
+
+ log.info("Server: Clean...");
+ cleanServer();
- log.info("Remove from server");
- removeFromServer("eclipse_tooling_proj");
- bot.sleep(TIME_5S);
- log.info("Run on server");
- projExplorer.runOnServer("eclipse_tooling_proj");
-
String serverName = OdeDeployTest.configuredState.getServer().name;
Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
@@ -160,9 +148,8 @@
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
server.expand();
- bot.sleep(TIME_5S);
- assertTrue(server.getNode("eclipse_tooling_proj [Started, Synchronized]").isVisible());
-
+ bot.sleep(TIME_20S);
+ assertTrue(server.getNode("eclipse_tooling_proj [Synchronized]").isVisible());
}
@Test
@@ -180,18 +167,36 @@
Assert.assertTrue(response.contains("</HelloWorldResponse>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Body>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Envelope>"));
+ }
+
+ @Test
+ public void cleanupTest(){
+ removeFromServer("eclipse_tooling_proj");
+ String serverName = OdeDeployTest.configuredState.getServer().name;
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
+ server.expand();
+ bot.sleep(TIME_20S);
+
+ List<String> projects = server.getNodes();
+
+ for(String s : projects){
+ assertFalse(s.contains("eclipse_tooling_proj"));
+ }
}
-
- public void removeFromServer(String projectName){
+ public static void removeFromServer(String projectName){
String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
bot.viewByTitle("Servers").show();
bot.viewByTitle("Servers").setFocus();
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
- bot.sleep(TIME_5S);
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
@@ -206,7 +211,24 @@
viewBot.tree(1).select(projectName);
viewBot.button("< Remove").click();
viewBot.button("Finish").click();
+ }
+ public static void cleanServer(){
+ String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Republish]").select();
+
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, "Clean...", false)).click();
+
+ SWTBotShell shell = OdeDeployTest.bot.shell("Server");
+ shell.activate();
+
+ shell.bot().button(IDELabel.Button.OK).click();
}
-
+
}
13 years, 3 months
JBoss Tools SVN: r35537 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 10:54:15 -0400 (Tue, 11 Oct 2011)
New Revision: 35537
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java
Log:
[JBIDE-9793] cleanup: removed commented code, removed sys.err output
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java 2011-10-11 14:39:05 UTC (rev 35536)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/ParametrizableWizardPageSupport.java 2011-10-11 14:54:15 UTC (rev 35537)
@@ -63,10 +63,8 @@
if (currentStatusStale) {
pageComplete = false;
} else if (currentStatus != null) {
-// pageComplete = !currentStatus.matches(nonValidatingSeverity);
pageComplete = !((nonValidatingSeverity | currentStatus.getSeverity()) == nonValidatingSeverity);
}
- System.err.println("pageComplete == " + pageComplete);
((WizardPage) getDialogPage()).setPageComplete(pageComplete);
}
}
13 years, 3 months
JBoss Tools SVN: r35536 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 10:39:05 -0400 (Tue, 11 Oct 2011)
New Revision: 35536
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/Status2BooleanConverter.java
Log:
[JBIDE-9793] cleanup: removed commented code, removed sys.err output
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/Status2BooleanConverter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/Status2BooleanConverter.java 2011-10-11 10:37:51 UTC (rev 35535)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/Status2BooleanConverter.java 2011-10-11 14:39:05 UTC (rev 35536)
@@ -46,22 +46,9 @@
}
int current = ((IStatus) fromObject).getSeverity();
-// switch (severity) {
-// default:
-// case IStatus.ERROR:
-// return current != IStatus.ERROR;
-// case IStatus.WARNING:
-// return current != IStatus.WARNING;
-// case IStatus.INFO:
-// return current != IStatus.INFO;
-// case IStatus.OK:
-// return current != IStatus.OK;
-// }
if (current == IStatus.OK) {
- System.err.println("converter result = " + (severity == IStatus.OK) + "<- current = " + current + " configured = " + severity);
return severity == IStatus.OK;
}
- System.err.println("converter result = " + ((severity | current) == severity));
return (severity | current) == severity;
}
}
\ No newline at end of file
13 years, 3 months
JBoss Tools SVN: r35534 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 06:37:10 -0400 (Tue, 11 Oct 2011)
New Revision: 35534
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
Log:
[JBIDE-9793] added confirmation dialog when deleting an application
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-11 10:30:26 UTC (rev 35533)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-11 10:37:10 UTC (rev 35534)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.databinding.viewers.ViewerProperties;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.layout.TableColumnLayout;
@@ -116,7 +117,7 @@
Button detailsButton = new Button(container, SWT.PUSH);
detailsButton.setText("De&tails");
GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(80, SWT.DEFAULT).applyTo(detailsButton);
- DataBindingUtils.bindEnablementToValidationStatus(detailsButton, IStatus.INFO, dbc , selectedApplicationBinding);
+ DataBindingUtils.bindEnablementToValidationStatus(detailsButton, IStatus.INFO, dbc, selectedApplicationBinding);
detailsButton.addSelectionListener(onDetails(dbc));
}
@@ -125,21 +126,26 @@
@Override
public void doubleClick(DoubleClickEvent event) {
-// try {
-// ISelection selection = event.getSelection();
-// if (selection instanceof StructuredSelection) {
-// Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-// if (firstElement instanceof IApplication) {
-// String url = ((IApplication) firstElement).getApplicationUrl();
-// BrowserUtil.checkedCreateExternalBrowser(url, OpenshiftUIActivator.PLUGIN_ID,
-// OpenshiftUIActivator.getDefault().getLog());
-// }
-// }
-// } catch (OpenshiftException e) {
-// IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
-// "Could not open Openshift Express application in browser", e);
-// OpenshiftUIActivator.getDefault().getLog().log(status);
-// }
+ // try {
+ // ISelection selection = event.getSelection();
+ // if (selection instanceof StructuredSelection) {
+ // Object firstElement = ((IStructuredSelection)
+ // selection).getFirstElement();
+ // if (firstElement instanceof IApplication) {
+ // String url = ((IApplication)
+ // firstElement).getApplicationUrl();
+ // BrowserUtil.checkedCreateExternalBrowser(url,
+ // OpenshiftUIActivator.PLUGIN_ID,
+ // OpenshiftUIActivator.getDefault().getLog());
+ // }
+ // }
+ // } catch (OpenshiftException e) {
+ // IStatus status = new Status(IStatus.ERROR,
+ // OpenshiftUIActivator.PLUGIN_ID,
+ // "Could not open Openshift Express application in browser",
+ // e);
+ // OpenshiftUIActivator.getDefault().getLog().log(status);
+ // }
openDetailsDialog();
}
};
@@ -171,18 +177,18 @@
cell.setText(application.getCartridge().getName());
}
}, viewer, tableLayout);
-// createTableColumn("URL", 3, new CellLabelProvider() {
-//
-// @Override
-// public void update(ViewerCell cell) {
-// try {
-// IApplication application = (IApplication) cell.getElement();
-// cell.setText(application.getApplicationUrl());
-// } catch (OpenshiftException e) {
-// // ignore
-// }
-// }
-// }, viewer, tableLayout);
+ // createTableColumn("URL", 3, new CellLabelProvider() {
+ //
+ // @Override
+ // public void update(ViewerCell cell) {
+ // try {
+ // IApplication application = (IApplication) cell.getElement();
+ // cell.setText(application.getApplicationUrl());
+ // } catch (OpenshiftException e) {
+ // // ignore
+ // }
+ // }
+ // }, viewer, tableLayout);
return viewer;
}
@@ -201,7 +207,14 @@
@Override
public void widgetSelected(SelectionEvent e) {
try {
- WizardUtils.runInWizard(new DeleteApplicationJob(), getWizard().getContainer(), dbc);
+ if (MessageDialog.openConfirm(getShell(),
+ "Delete Application",
+ NLS.bind(
+ "You're up to delete all data within an application. The data may not be recovered. "
+ + "Are you sure that you want to delete application {0}?",
+ model.getSelectedApplication().getName()))) {
+ WizardUtils.runInWizard(new DeleteApplicationJob(), getWizard().getContainer(), dbc);
+ }
} catch (Exception ex) {
// ignore
}
@@ -237,7 +250,7 @@
Shell shell = getContainer().getShell();
new ApplicationDetailsDialog(model.getSelectedApplication(), shell).open();
}
-
+
@Override
protected void onPageActivated(DataBindingContext dbc) {
try {
@@ -283,7 +296,7 @@
try {
model.destroyCurrentApplication();
getContainer().getShell().getDisplay().syncExec(new Runnable() {
-
+
@Override
public void run() {
viewer.refresh();
13 years, 3 months
JBoss Tools SVN: r35533 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 06:30:26 -0400 (Tue, 11 Oct 2011)
New Revision: 35533
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
[JBIDE-9793] corrected required plug-ins version ranges
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-11 10:27:06 UTC (rev 35532)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-11 10:30:26 UTC (rev 35533)
@@ -8,18 +8,18 @@
org.jboss.ide.eclipse.as.egit.core;bundle-version="2.3.0",
org.eclipse.egit.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jgit;bundle-version="[1.1.0,2.0.0]",
+ org.eclipse.jgit;bundle-version="[1.1.0,2.0.0)",
com.jcraft.jsch;bundle-version="0.1.44",
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.databinding;bundle-version="1.4.0",
- org.eclipse.core.databinding.beans;bundle-version="1.2.100",
+ org.eclipse.core.databinding.beans;bundle-version="[1.2.0,2.0.0)",
org.eclipse.core.databinding.observable;bundle-version="1.4.0",
org.eclipse.core.databinding.property;bundle-version="1.4.0",
- org.eclipse.jface.databinding;bundle-version="1.5.0",
+ org.eclipse.jface.databinding;bundle-version="[1.5.0,2.0.0)",
org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.wst.server.core;bundle-version="[1.1.3,2.0.0)",
- org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)"
Bundle-ActivationPolicy: lazy
13 years, 3 months
JBoss Tools SVN: r35532 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-11 06:27:06 -0400 (Tue, 11 Oct 2011)
New Revision: 35532
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
[JBIDE-9793] cloning openshift repo: corrected required jgit plug version
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-11 10:10:09 UTC (rev 35531)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-11 10:27:06 UTC (rev 35532)
@@ -8,7 +8,7 @@
org.jboss.ide.eclipse.as.egit.core;bundle-version="2.3.0",
org.eclipse.egit.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jgit,
+ org.eclipse.jgit;bundle-version="[1.1.0,2.0.0]",
com.jcraft.jsch;bundle-version="0.1.44",
org.eclipse.ui,
org.eclipse.core.runtime,
13 years, 3 months