JBoss Tools SVN: r23702 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext: .settings and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-23 09:41:13 -0400 (Fri, 23 Jul 2010)
New Revision: 23702
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath
Log:
https://jira.jboss.org/browse/JBIDE-3124
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath 2010-07-23 13:04:23 UTC (rev 23701)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath 2010-07-23 13:41:13 UTC (rev 23702)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs 2010-07-23 13:41:13 UTC (rev 23702)
@@ -0,0 +1,8 @@
+#Fri Jun 11 14:44:26 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r23701 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext: src/org/jboss/tools/cdi/text/ext and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-07-23 09:04:23 -0400 (Fri, 23 Jul 2010)
New Revision: 23701
Added:
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/EventHyperlinkDetector.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-3124
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml 2010-07-23 12:40:16 UTC (rev 23700)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml 2010-07-23 13:04:23 UTC (rev 23701)
@@ -22,4 +22,14 @@
</hyperlinkDetector>
</extension>
+ <extension
+ point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
+ <hyperlinkDetector
+ class="org.jboss.tools.cdi.text.ext.hyperlink.EventHyperlinkDetector"
+ id="org.jboss.tools.cdi.text.ext.hyperlink.EventHyperlinkDetector"
+ name="%EventHyperlinkDetector"
+ targetId="org.eclipse.jdt.ui.javaCode">
+ </hyperlinkDetector>
+ </extension>
+
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2010-07-23 12:40:16 UTC (rev 23700)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2010-07-23 13:04:23 UTC (rev 23701)
@@ -26,4 +26,5 @@
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER;
+ public static String CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD;
}
Added: 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 (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2010-07-23 13:04:23 UTC (rev 23701)
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.text.ext.hyperlink;
+
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IDecorator;
+import org.jboss.tools.cdi.core.IInterceptor;
+import org.jboss.tools.cdi.core.IObserverMethod;
+import org.jboss.tools.cdi.core.IProducerField;
+import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+
+public class EventHyperlink extends AbstractHyperlink{
+ IObserverMethod observerMethod;
+ IRegion region;
+
+ public EventHyperlink(IRegion region, IObserverMethod observerMethod, IDocument document){
+ this.observerMethod = observerMethod;
+ this.region = region;
+ setDocument(document);
+ }
+
+
+ @Override
+ protected IRegion doGetHyperlinkRegion(int offset) {
+ return region;
+ }
+
+ protected void doHyperlink(IRegion region) {
+ IEditorPart part = null;
+
+ if(observerMethod != null && observerMethod.getClassBean() != null){
+ try{
+ part = JavaUI.openInEditor(observerMethod.getClassBean().getBeanClass());
+ }catch(JavaModelException ex){
+ CDIExtensionsPlugin.log(ex);
+ }catch(PartInitException ex){
+ CDIExtensionsPlugin.log(ex);
+ }
+
+ IJavaElement element = observerMethod.getMethod();
+ if (part != null) {
+ JavaUI.revealInEditor(part, element);
+ }
+ }
+ if (part == null)
+ openFileFailed();
+ }
+
+ @Override
+ public String getHyperlinkText() {
+ return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getMethod().getElementName();
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java 2010-07-23 13:04:23 UTC (rev 23701)
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.text.ext.hyperlink;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.ICodeAssist;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.ResolvedBinaryType;
+import org.eclipse.jdt.internal.core.ResolvedSourceType;
+import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
+import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IObserverMethod;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
+
+public class EventHyperlinkDetector extends AbstractHyperlinkDetector{
+
+
+ public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
+ IRegion region, boolean canShowMultipleHyperlinks) {
+ ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
+ if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ return null;
+
+ int offset= region.getOffset();
+
+ IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, false);
+ if (input == null)
+ return null;
+
+ if (input.getResource() == null || input.getResource().getProject() == null)
+ return null;
+
+ IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
+ IRegion wordRegion= JavaWordFinder.findWord(document, offset);
+ if (wordRegion == null)
+ return null;
+
+ IFile file = null;
+
+ try {
+ IResource resource = input.getCorrespondingResource();
+ if (resource instanceof IFile)
+ file = (IFile) resource;
+ } catch (JavaModelException e) {
+ CDIExtensionsPlugin.log(e);
+ }
+
+ if(file == null)
+ return null;
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(file.getProject());
+ if(cdiNature == null)
+ return null;
+
+ IJavaElement[] elements = null;
+
+ try {
+ elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ if (elements == null)
+ return null;
+
+ ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
+ for (IJavaElement element : elements) {
+ int position = 0;
+ if(element instanceof ResolvedSourceType || element instanceof ResolvedBinaryType){
+ ICompilationUnit cUnit = (ICompilationUnit)input;
+ element = cUnit.getElementAt(wordRegion.getOffset());
+ if(element == null)
+ continue;
+
+ if(element instanceof IMethod){
+ position = offset;
+ }
+ }
+ Set<IObserverMethod> observerMethods = findEvents(cdiNature, element, position, file);
+ for(IObserverMethod observerMethod : observerMethods){
+ hyperlinks.add(new EventHyperlink(region, observerMethod, document));
+ }
+ }
+
+ if (hyperlinks != null && !hyperlinks.isEmpty()) {
+ return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
+ }
+ } catch (JavaModelException jme) {
+ CDIExtensionsPlugin.log(jme);
+ }
+ return null;
+ }
+
+ private Set<IObserverMethod> findEvents(CDICoreNature nature, IJavaElement element, int offset, IFile file){
+ ICDIProject cdiProject = nature.getDelegate();
+
+ if(cdiProject == null){
+ return (Set<IObserverMethod>)Collections.EMPTY_SET;
+ }
+
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+
+ IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element, offset);
+ if(injectionPoint == null){
+ return (Set<IObserverMethod>)Collections.EMPTY_SET;
+ }
+
+ Set<IObserverMethod> resultObserverSet = cdiProject.resolveObserverMethods(injectionPoint);
+
+ return resultObserverSet;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2010-07-23 12:40:16 UTC (rev 23700)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2010-07-23 13:04:23 UTC (rev 23701)
@@ -5,3 +5,4 @@
CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN=Open Injected Bean
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method
+CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD=Open CDI Observer Method
15 years, 9 months
JBoss Tools SVN: r23700 - in workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-23 08:40:16 -0400 (Fri, 23 Jul 2010)
New Revision: 23700
Modified:
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
Log:
Slight changes and a bit of javadoc for a method that cna return null JBIDE-6580
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-23 12:15:09 UTC (rev 23699)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-23 12:40:16 UTC (rev 23700)
@@ -35,7 +35,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.xpl.ModulePackager;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -43,6 +43,7 @@
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentTypePrefs;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
public class PublishUtil {
@@ -83,8 +84,9 @@
public static String getDeployRootFolder(IModule[] moduleTree,
IDeployableServer server, String defaultFolder, String moduleProperty) {
- IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server.getServer());
- return getDeployRootFolder(moduleTree, type.getId(),
+ DeployableServerBehavior behavior = ServerConverter.getDeployableServerBehavior(server.getServer());
+ String typeId = behavior.createPublishMethod().getPublishMethodType().getId();
+ return getDeployRootFolder(moduleTree, typeId,
server, defaultFolder, moduleProperty);
}
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2010-07-23 12:15:09 UTC (rev 23699)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2010-07-23 12:40:16 UTC (rev 23700)
@@ -32,6 +32,16 @@
public static final String DEPLOYMENT_PREFERENCES_KEY = "org.jboss.ide.eclipse.as.core.util.deploymentPreferenceKey"; //$NON-NLS-1$
public static final String CURRENT_METHOD_PROPERTY = "publishMethod"; //$NON-NLS-1$
+ /**
+ * This method can return null and is only meant to show what deployment method
+ * is currently stored in a server's deployment preferences.
+ *
+ * To get a more accurate version (with a default) please use
+ * DeployableServerBehavior.createPublishMethod().getPublishMethodType()
+ *
+ * @param server
+ * @return
+ */
public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server) {
DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
String type = prefs.getProperty(DeploymentPreferenceLoader.CURRENT_METHOD_PROPERTY);
15 years, 9 months
JBoss Tools SVN: r23699 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-23 08:15:09 -0400 (Fri, 23 Jul 2010)
New Revision: 23699
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ObserverMethod.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
https://jira.jboss.org/browse/JBIDE-3124
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-07-23 12:12:07 UTC (rev 23698)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-07-23 12:15:09 UTC (rev 23699)
@@ -73,4 +73,6 @@
public String PRE_DESTROY_TYPE_NAME = "javax.annotation.PreDestroy";
public String POST_CONSTRUCTOR_TYPE_NAME = "javax.annotation.PostConstruct";
+
+ public String EVENT_TYPE_NAME = "javax.enterprise.event.Event";
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java 2010-07-23 12:12:07 UTC (rev 23698)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java 2010-07-23 12:15:09 UTC (rev 23699)
@@ -20,9 +20,9 @@
public interface IObserverMethod extends IBeanMethod {
/**
- * Returns the set of @Observes annotations of parameters of this method.
+ * Returns the set of parameters of this method with @Observes annotation.
*
- * @return the set of @Observes annotations of parameters of this method
+ * @return the set of parameters of this method with @Observes annotation
*/
- Set<IAnnotationDeclaration> getObservesAnnotationDeclarations();
+ Set<IParameter> getObservedParameters();
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-07-23 12:12:07 UTC (rev 23698)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-07-23 12:15:09 UTC (rev 23699)
@@ -40,6 +40,7 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParametedType;
@@ -425,6 +426,33 @@
return true;
}
+ public static boolean areMatchingEventQualifiers(Set<IQualifierDeclaration> eventQualifiers, IType... paramQualifiers) throws CoreException {
+ if(eventQualifiers == null || eventQualifiers.isEmpty()) {
+ if(paramQualifiers == null || paramQualifiers.length == 0) {
+ return true;
+ }
+ }
+
+ TreeSet<String> paramKeys = new TreeSet<String>();
+ if(paramQualifiers != null) for (IType d: paramQualifiers) {
+ paramKeys.add(d.getFullyQualifiedName());
+ }
+
+ TreeSet<String> eventKeys = new TreeSet<String>();
+ if(eventQualifiers != null) for (IAnnotationDeclaration d: eventQualifiers) {
+ eventKeys.add(d.getType().getFullyQualifiedName());
+ }
+
+ if(!eventKeys.contains(CDIConstants.ANY_QUALIFIER_TYPE_NAME)) {
+ eventKeys.add(CDIConstants.ANY_QUALIFIER_TYPE_NAME);
+ }
+
+ for(String k: paramKeys) {
+ if(!eventKeys.contains(k)) return false;
+ }
+ return true;
+ }
+
public static String getAnnotationDeclarationKey(IAnnotationDeclaration d) throws CoreException {
ICDIAnnotation annotation = d.getAnnotation();
Set<IMethod> nb = annotation == null ? new HashSet<IMethod>() : annotation.getNonBindingMethods();
@@ -682,10 +710,49 @@
return result;
}
- public Set<IObserverMethod> resolveObserverMethods(
- IInjectionPoint injectionPoint) {
- // TODO
- return new HashSet<IObserverMethod>();
+ public Set<IObserverMethod> resolveObserverMethods(IInjectionPoint injectionPoint) {
+ Set<IObserverMethod> result = new HashSet<IObserverMethod>();
+
+ IParametedType t = injectionPoint.getType();
+ if(t == null || t.getType() == null || !CDIConstants.EVENT_TYPE_NAME.equals(t.getType().getFullyQualifiedName())) {
+ return result;
+ }
+ List<? extends IParametedType> ps = t.getParameters();
+ if(ps.isEmpty()) {
+ return result;
+ }
+
+ IParametedType eventType = ps.get(0);
+
+ for (IClassBean b: classBeans.values()) {
+ Set<IBeanMethod> ms = b.getObserverMethods();
+ for (IBeanMethod m: ms) {
+ if(m instanceof IObserverMethod) {
+ IObserverMethod om = (IObserverMethod)m;
+ Set<IParameter> params = om.getObservedParameters();
+ if(params.isEmpty()) continue;
+ IParameter param = params.iterator().next();
+ IParametedType paramType = param.getType();
+ if(!((ParametedType)eventType).isAssignableTo((ParametedType)paramType, true)) {
+ continue;
+ }
+ Set<IQualifier> qs = ((InjectionPointParameter)param).getQualifiers();
+ List<IType> paramQualifiers = new ArrayList<IType>();
+ for (IQualifier q: qs) {
+ if(q.getSourceType() != null) paramQualifiers.add(q.getSourceType());
+ }
+ try {
+ if(areMatchingEventQualifiers(injectionPoint.getQualifierDeclarations(), paramQualifiers.toArray(new IType[0]))) {
+ result.add(om);
+ }
+ } catch (CoreException err) {
+ CDICorePlugin.getDefault().logError(err);
+ }
+ }
+ }
+ }
+
+ return result;
}
public Set<IBeanMethod> resolveDisposers(IProducerMethod producer) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-07-23 12:12:07 UTC (rev 23698)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-07-23 12:15:09 UTC (rev 23699)
@@ -74,8 +74,10 @@
bm = new ProducerMethod();
} else if(m.getInjectAnnotation() != null) {
bm = new InjectionPointMethod();
+ } else if(m.isObserver()) {
+ bm = new ObserverMethod();
} else {
- //add observer case
+ //add other cases
bm = new BeanMethod();
}
bm.setClassBean(this);
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ObserverMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ObserverMethod.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ObserverMethod.java 2010-07-23 12:15:09 UTC (rev 23699)
@@ -0,0 +1,25 @@
+package org.jboss.tools.cdi.internal.core.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IObserverMethod;
+import org.jboss.tools.cdi.core.IParameter;
+
+public class ObserverMethod extends BeanMethod implements IObserverMethod {
+
+ @Override
+ protected Parameter newParameter() {
+ return new InjectionPointParameter();
+ }
+
+ public Set<IParameter> getObservedParameters() {
+ Set<IParameter> result = new HashSet<IParameter>();
+ for (IParameter p: parameters) {
+ if(p.isAnnotationPresent(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME)) result.add(p);
+ }
+ return result;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ObserverMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r23698 - workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-23 08:12:07 -0400 (Fri, 23 Jul 2010)
New Revision: 23698
Modified:
workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
Log:
JBIDE-6580 Changes to some tests to account for new failures. JSTDeploymentTester still fails but works in UI, and I have been completely unable to figure out why it works in UI and not API. I understand why it fails in API (bug upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=320631) but not why it works with UI. Effect on our product is uncertain.
Modified: workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
===================================================================
--- workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2010-07-23 11:28:19 UTC (rev 23697)
+++ workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2010-07-23 12:12:07 UTC (rev 23698)
@@ -1,11 +1,9 @@
package org.jboss.ide.eclipse.as.test.publishing.v2;
import java.io.BufferedInputStream;
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
Modified: workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
===================================================================
--- workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2010-07-23 11:28:19 UTC (rev 23697)
+++ workspace/rstryker/rse/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2010-07-23 12:12:07 UTC (rev 23698)
@@ -255,6 +255,10 @@
unzipFile(unzip1.append("mvel2.jar"), unzip2);
assertTrue(unzip2.toFile().list().length > 1);
System.out.println("end");
+
+ removeModule(mod);
+ publish();
+ assertFalse(zipped.toFile().exists());
}
15 years, 9 months
JBoss Tools SVN: r23697 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-07-23 07:28:19 -0400 (Fri, 23 Jul 2010)
New Revision: 23697
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , Externalize Action was added to the cotext menu for xhtml files.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-07-23 11:04:22 UTC (rev 23696)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-07-23 11:28:19 UTC (rev 23697)
@@ -126,6 +126,13 @@
id="org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
</dynamic>
</menuContribution>
+ <menuContribution
+ locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
+ <dynamic
+ class="org.jboss.tools.vpe.editor.menu.ExternalizeStringsContributionItem"
+ id="org.jboss.tools.vpe.editor.menu.ExternalizeStringsContributionItem">
+ </dynamic>
+ </menuContribution>
</extension>
<extension
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-07-23 11:04:22 UTC (rev 23696)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-07-23 11:28:19 UTC (rev 23697)
@@ -286,12 +286,6 @@
* @return {@code true} if and only if the visual representation is created and added successfully
*/
private boolean addNode(Node sourceNode, nsIDOMNode visualNextNode, nsIDOMNode visualContainer) {
- if (sourceNode.toString().indexOf("h:outputText/@[1568, 1603] (<h:outputText value=\"first text\" />)") > -1) {
- System.out.println("My Out 11");
- }
- if (sourceNode.toString().indexOf("h:outputText/@[1153, 1188] (<h:outputText value=\"panel text\" />)") > -1) {
- System.out.println("My Out 22");
- }
try {
nsIDOMNode visualNewNode = createNode(sourceNode, visualContainer);
// Commented as fix for JBIDE-3012.
@@ -678,7 +672,7 @@
*/
protected void addChildren(VpeTemplate containerTemplate,
Node sourceContainer, nsIDOMNode visualContainer) {
-
+
NodeList sourceNodes = sourceContainer.getChildNodes();
int len = sourceNodes.getLength();
int childrenCount = 0;
@@ -703,8 +697,9 @@
for (int i = 0; i < childrenInfoList.size(); i++) {
VpeChildrenInfo info = (VpeChildrenInfo) childrenInfoList.get(i);
nsIDOMNode visualParent = info.getVisualParent();
- if (visualParent == null)
+ if (visualParent == null) {
visualParent = visualOldContainer;
+ }
List<?> sourceChildren = info.getSourceChildren();
int childrenCount = 0;
if (sourceChildren != null) {
15 years, 9 months
JBoss Tools SVN: r23696 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-07-23 07:04:22 -0400 (Fri, 23 Jul 2010)
New Revision: 23696
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
Log:
fix https://jira.jboss.org/browse/JBIDE-5945
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-07-23 09:50:24 UTC (rev 23695)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-07-23 11:04:22 UTC (rev 23696)
@@ -194,6 +194,7 @@
FaceletTag tag = new FaceletTag();
tag.setId(t);
tag.setName(new XMLValueInfo(t, ATTR_TAG_NAME));
+ tag.setDescription(new XMLValueInfo(t, AbstractComponent.DESCRIPTION));
XModelObject d = t.getChildByPath("declaration"); //$NON-NLS-1$
if(d != null && d.getModelEntity().getName().startsWith("FaceletTaglibComponent")) { //$NON-NLS-1$
String componentType = d.getAttributeValue(ATTR_COMPONENT_TYPE); //$NON-NLS-1$
15 years, 9 months
JBoss Tools SVN: r23695 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: src/org/jboss/tools/ws/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-07-23 05:50:24 -0400 (Fri, 23 Jul 2010)
New Revision: 23695
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java
Log:
adding soap12 related tests
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml 2010-07-23 09:50:24 UTC (rev 23695)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
+ <soap12:Body>
+ <GetBibleWordsByChapterAndVerse xmlns="http://www.webserviceX.NET">
+ <BookTitle>Mark</BookTitle>
+ <chapter>1</chapter>
+ <Verse>1</Verse>
+ </GetBibleWordsByChapterAndVerse>
+ </soap12:Body>
+</soap12:Envelope>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java 2010-07-23 08:39:55 UTC (rev 23694)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java 2010-07-23 09:50:24 UTC (rev 23695)
@@ -77,36 +77,10 @@
Assert.assertEquals(0, wstv.getRequestArgs(Request_Arg_Type.HEADER).keySet().size());
wstv.setRequestType(Request_Type.JAX_WS);
- SelectWSDLDialog dlg = wstv.getFromWSDL();
- try {
- dlg.openURL();
- SWTBotShell sh = bot.activeShell();
- sh.bot().text().typeText(SERVICE_URL + "?WSDL");
- sh.bot().button("OK").click();
- bot.sleep(1000);
- Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI());
- List<String> items = dlg.getServices();
- L.log(Level.FINE, "Services: {0}", items);
- Assert.assertEquals(1, items.size());
- Assert.assertTrue(items.contains("BibleWebservice"));
- items = dlg.getPorts();
- L.log(Level.FINE, "Ports: {0}", items);
- Assert.assertEquals(2, items.size());
- Assert.assertTrue(items.contains("BibleWebserviceSoap"));
- Assert.assertTrue(items.contains("BibleWebserviceSoap12"));
- items = dlg.getOperations();
- L.log(Level.FINE, "Operations: {0}", items);
- Assert.assertEquals(4, items.size());
- Assert.assertTrue(items.contains("GetBookTitles"));
- Assert.assertTrue(items.contains("GetBibleWordsByChapterAndVerse"));
- dlg.selectOperation("GetBibleWordsbyKeyWord");
- dlg.ok();
- Assert.assertEquals("http://www.webservicex.net/BibleWebservice.asmx", wstv.getServiceURL());
- } finally {
- if (dlg.isOpen()) {
- dlg.close();
- }
- }
+ selectPort(wstv, "BibleWebserviceSoap");
+ Assert.assertTrue(wstv.getRequestBody().contains("http://schemas.xmlsoap.org/soap/envelope/"));
+ selectPort(wstv, "BibleWebserviceSoap12");
+ Assert.assertTrue("Got: " + wstv.getRequestBody(), wstv.getRequestBody().contains("http://www.w3.org/2003/05/soap-envelope"));
viewBot.close();
}
@@ -181,6 +155,40 @@
}
/**
+ * Test SOAP 1.2 service invocation
+ */
+ @Test
+ public void testSOAP12Service() {
+ WsTesterView wstv = new WsTesterView();
+ wstv.show();
+ wstv.setRequestType(Request_Type.JAX_WS);
+ Assert.assertEquals(Request_Type.JAX_WS, wstv.getRequestType());
+ SelectWSDLDialog dlg = wstv.getFromWSDL();
+ try {
+ dlg.openURL();
+ SWTBotShell sh = bot.activeShell();
+ sh.bot().text().typeText(SERVICE_URL + "?WSDL");
+ sh.bot().button("OK").click();
+ bot.sleep(1000);
+ Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI());
+ dlg.selectPort("BibleWebserviceSoap12");
+ dlg.ok();
+ } finally {
+ if (dlg.isOpen()) {
+ dlg.close();
+ }
+ }
+ Assert.assertEquals(SERVICE_URL, wstv.getServiceURL());
+ InputStream is = WsTesterTest.class.getResourceAsStream("/resources/jbossws/message_soap12_out.xml");
+ wstv.setRequestBody(readResource(is));
+ wstv.invoke();
+ String rsp = wstv.getResponseBody();
+ L.log(Level.FINE, "SOAP response: {0}", rsp);
+ Assert.assertTrue(rsp.trim().length() > 0);
+ checkResponse(rsp, "<BookTitle>Mark</BookTitle>");
+ }
+
+ /**
* Test REST service invocation (GET request)
*/
@Test
@@ -219,7 +227,7 @@
wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse");
String requestBody = "BookTitle=John&chapter=3&Verse=1\r";
wstv.setRequestBody(requestBody);
- wstv.expandSection(Request_Arg_Type.HEADER.toString());
+ wstv.expandSection(JBossWSUIMessages.JAXRSWSTestView2_ResponseHeaders_Section);
wstv.addRequestArg(Request_Arg_Type.HEADER, "Content-Type", "application/x-www-form-urlencoded");
wstv.addRequestArg(Request_Arg_Type.HEADER, "Content-Length", String.valueOf(requestBody.length()));
try {
@@ -245,7 +253,6 @@
wstv.invoke();
Assert.assertEquals(0, wstv.getRequestArgs(Request_Arg_Type.PARAMETER).size());
String rsp = wstv.getResponseBody();
- wstv.expandSection(JBossWSUIMessages.JAXRSWSTestView2_ResponseHeaders_Section);
String[] rspHeaders = wstv.getResponseHeaders();
L.log(Level.FINE, "REST response: {0}", rsp);
L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders));
@@ -338,4 +345,37 @@
}
}
}
+
+ private void selectPort(WsTesterView wstv, String portName) {
+ SelectWSDLDialog dlg = wstv.getFromWSDL();
+ try {
+ dlg.openURL();
+ SWTBotShell sh = bot.activeShell();
+ sh.bot().text().typeText(SERVICE_URL + "?WSDL");
+ sh.bot().button("OK").click();
+ bot.sleep(1000);
+ Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI());
+ List<String> items = dlg.getServices();
+ L.log(Level.FINE, "Services: {0}", items);
+ Assert.assertEquals(1, items.size());
+ Assert.assertTrue(items.contains("BibleWebservice"));
+ items = dlg.getPorts();
+ L.log(Level.FINE, "Ports: {0}", items);
+ Assert.assertEquals(2, items.size());
+ Assert.assertTrue(items.contains("BibleWebserviceSoap"));
+ Assert.assertTrue(items.contains("BibleWebserviceSoap12"));
+ dlg.selectPort(portName);
+ items = dlg.getOperations();
+ L.log(Level.FINE, "Operations: {0}", items);
+ Assert.assertEquals(4, items.size());
+ Assert.assertTrue(items.contains("GetBookTitles"));
+ Assert.assertTrue(items.contains("GetBibleWordsByChapterAndVerse"));
+ dlg.selectOperation("GetBibleWordsbyKeyWord");
+ dlg.ok();
+ Assert.assertEquals("http://www.webservicex.net/BibleWebservice.asmx", wstv.getServiceURL());
+ } finally {
+ if (dlg.isOpen()) {
+ dlg.close();
+ }
+ } }
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java 2010-07-23 08:39:55 UTC (rev 23694)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java 2010-07-23 09:50:24 UTC (rev 23695)
@@ -47,7 +47,7 @@
//Service:
return getItems(JBossWSUIMessages.WSDLBrowseDialog_Service_Field);
}
-
+
public void selectService(String service) {
//Service:
bot().comboBoxWithLabel(JBossWSUIMessages.WSDLBrowseDialog_Service_Field).setSelection(service);
@@ -58,6 +58,11 @@
return getItems(JBossWSUIMessages.WSDLBrowseDialog_Port_Field);
}
+ public void selectPort(String port) {
+ //Service:
+ bot().comboBoxWithLabel(JBossWSUIMessages.WSDLBrowseDialog_Port_Field).setSelection(port);
+ }
+
public List<String> getOperations() {
return Arrays.asList(getOperationsList().getItems());
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java 2010-07-23 08:39:55 UTC (rev 23694)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java 2010-07-23 09:50:24 UTC (rev 23695)
@@ -144,7 +144,7 @@
return ((ExpandableComposite) widget.getParent()).isExpanded();
}
});
- assert !expanded : "Section '" + widget.getText() + "' is already expanded";
+ assert !expanded : "Section '" + getText() + "' is already expanded";
click(true);
}
}
15 years, 9 months
JBoss Tools SVN: r23694 - in trunk/ws/tests/org.jboss.tools.ws.ui.test: resources/jbide6694 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-07-23 04:39:55 -0400 (Fri, 23 Jul 2010)
New Revision: 23694
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl
Removed:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
Log:
improved a test for jbide6694
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl 2010-07-23 08:39:55 UTC (rev 23694)
@@ -0,0 +1,8 @@
+<definitions name="ConverterPortType" targetNamespace="http://ns.test.jboss.org/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://test.jboss.org/ns" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ns.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <import location="ConverterPortTypeO.wsdl" namespace="http://test.jboss.org/ns"/>
+ <service name="ConverterPortType">
+ <port binding="ns1:ConverterPortTypeBinding" name="ConverterPortTypeImplPort">
+ <soap:address location="http://localhost:8080/ws/ConverterPortType"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl 2010-07-23 08:39:55 UTC (rev 23694)
@@ -0,0 +1,52 @@
+<definitions name="ConverterPortType" targetNamespace="http://test.jboss.org/ns" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://test.jboss.org/ns" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ns.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns" version="1.0" xmlns:tns="http://test.jboss.org/ns" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="ChangeUnit">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="value" type="xs:double"/>
+ <xs:element name="fromUnit" type="tns:Units"/>
+ <xs:element name="toUnit" type="tns:Units"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ChangeUnitResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ChangeUnitResult" type="xs:double"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:simpleType name="Units">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kilometer"/>
+ <xs:enumeration value="meter"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <message name="ConverterPortType_convertResponse">
+ <part element="ns1:ChangeUnitResponse" name="parameters"/>
+ </message>
+ <message name="ConverterPortType_convert">
+ <part element="ns1:ChangeUnit" name="parameters"/>
+ </message>
+ <portType name="ConverterPortType">
+ <operation name="convert" parameterOrder="parameters">
+ <input message="ns1:ConverterPortType_convert"/>
+ <output message="ns1:ConverterPortType_convertResponse"/>
+ </operation>
+ </portType>
+ <binding name="ConverterPortTypeBinding" type="ns1:ConverterPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="convert">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+</definitions>
\ No newline at end of file
Copied: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl (from rev 23692, trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl)
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl 2010-07-23 08:39:55 UTC (rev 23694)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:s="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test.jboss.org/ns" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns">
+ <s:element name="ChangeUnit">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="value" type="s:double" />
+ <s:element minOccurs="1" maxOccurs="1" name="fromUnit" type="tns:Units" />
+ <s:element minOccurs="1" maxOccurs="1" name="toUnit" type="tns:Units" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:simpleType name="Units">
+ <s:restriction base="s:string">
+ <s:enumeration value="kilometer" />
+ <s:enumeration value="meter" />
+ </s:restriction>
+ </s:simpleType>
+ <s:element name="ChangeUnitResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="ChangeUnitResult" type="s:double" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="double" type="s:double" />
+ </s:schema>
+ </wsdl:types>
+ <wsdl:message name="ChangeUnitIn">
+ <wsdl:part name="parameters" element="tns:ChangeUnit" />
+ </wsdl:message>
+ <wsdl:message name="ChangeUnitOut">
+ <wsdl:part name="parameters" element="tns:ChangeUnitResponse" />
+ </wsdl:message>
+ <wsdl:portType name="ConverterPortType">
+ <wsdl:operation name="convert">
+ <wsdl:input message="tns:ChangeUnitIn" />
+ <wsdl:output message="tns:ChangeUnitOut" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="ConverterBinding" type="tns:ConverterPortType">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="convert">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="Converter">
+ <wsdl:port name="ConverterPort" binding="tns:ConverterBinding">
+ <soap:address location="" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl 2010-07-23 08:15:04 UTC (rev 23693)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl 2010-07-23 08:39:55 UTC (rev 23694)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:s="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test.jboss.org/ns" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <s:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns">
- <s:element name="ChangeUnit">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="value" type="s:double" />
- <s:element minOccurs="1" maxOccurs="1" name="fromUnit" type="tns:Units" />
- <s:element minOccurs="1" maxOccurs="1" name="toUnit" type="tns:Units" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:simpleType name="Units">
- <s:restriction base="s:string">
- <s:enumeration value="kilometer" />
- <s:enumeration value="meter" />
- </s:restriction>
- </s:simpleType>
- <s:element name="ChangeUnitResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="ChangeUnitResult" type="s:double" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="double" type="s:double" />
- </s:schema>
- </wsdl:types>
- <wsdl:message name="ChangeUnitIn">
- <wsdl:part name="parameters" element="tns:ChangeUnit" />
- </wsdl:message>
- <wsdl:message name="ChangeUnitOut">
- <wsdl:part name="parameters" element="tns:ChangeUnitResponse" />
- </wsdl:message>
- <wsdl:portType name="ConverterPortType">
- <wsdl:operation name="convert">
- <wsdl:input message="tns:ChangeUnitIn" />
- <wsdl:output message="tns:ChangeUnitOut" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ConverterBinding" type="tns:ConverterPortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="convert">
- <soap:operation soapAction="" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="Converter">
- <wsdl:port name="ConverterPort" binding="tns:ConverterBinding">
- <soap:address location="" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-07-23 08:15:04 UTC (rev 23693)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-07-23 08:39:55 UTC (rev 23694)
@@ -99,11 +99,17 @@
@Test
public void testJBIDE6694() {
- String s1 = getSampleMessage("/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert");
+ String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
Assert.assertTrue(s1.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">"));
Assert.assertTrue(s1.contains("<value>?</value>"));
Assert.assertTrue(s1.contains("<fromUnit>?</fromUnit>"));
Assert.assertTrue(s1.contains("<toUnit>?</toUnit>"));
+
+ String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert");
+ Assert.assertTrue(s2.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">"));
+ Assert.assertTrue(s2.contains("<value>?</value>"));
+ Assert.assertTrue(s2.contains("<fromUnit>?</fromUnit>"));
+ Assert.assertTrue(s2.contains("<toUnit>?</toUnit>"));
}
private String getSampleMessage(String res, String service, String port, String binding, String operation) {
15 years, 9 months
JBoss Tools SVN: r23693 - trunk/documentation/whatsnew/core.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-07-23 04:15:04 -0400 (Fri, 23 Jul 2010)
New Revision: 23693
Modified:
trunk/documentation/whatsnew/core/core-news-3.2.0.M1.html
Log:
Link to the next page is updated.
Modified: trunk/documentation/whatsnew/core/core-news-3.2.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/core/core-news-3.2.0.M1.html 2010-07-23 00:34:55 UTC (rev 23692)
+++ trunk/documentation/whatsnew/core/core-news-3.2.0.M1.html 2010-07-23 08:15:04 UTC (rev 23693)
@@ -11,8 +11,7 @@
<body>
<h1>What's New Core/General</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../as/as-news-3.1.0.CR2.html">AS Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.4.0.M1.html">Hibernate Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
15 years, 9 months