JBoss Tools SVN: r35914 - branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-21 17:35:09 -0400 (Fri, 21 Oct 2011)
New Revision: 35914
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10001 NPE if saying no to publish on openshift
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 21:30:28 UTC (rev 35913)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 21:35:09 UTC (rev 35914)
@@ -87,7 +87,7 @@
int response = messageBox.open();
if (response == SWT.YES)
b[0] = true;
- b[1] = false;
+ b[0] = false;
}
});
return b[0];
13 years, 2 months
JBoss Tools SVN: r35913 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-21 17:30:28 -0400 (Fri, 21 Oct 2011)
New Revision: 35913
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
portlet depends on as (https://issues.jboss.org/browse/JBIDE-9985)
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 19:49:36 UTC (rev 35912)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 21:30:28 UTC (rev 35913)
@@ -33,7 +33,7 @@
forge -> [none]
examples -> portlet, jst
teiid, runtime -> tests
-portlet -> seam
+portlet -> seam, as, tests, usage
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
13 years, 2 months
JBoss Tools SVN: r35912 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-21 15:49:36 -0400 (Fri, 21 Oct 2011)
New Revision: 35912
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
Log:
JBIDE-9989
https://issues.jboss.org/browse/JBIDE-9989
Test CDIUtilTest is improved.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java 2011-10-21 19:33:17 UTC (rev 35911)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java 2011-10-21 19:49:36 UTC (rev 35912)
@@ -33,9 +33,18 @@
@Inject
public void initialize(FooBean children, TestBean children2) {
}
+
+ @Inject TestBean children;
+ @Inject FooBean children2;
- static class TestBean {}
+ static class TestBean {
+ @Inject TestBean children;
+ @Inject FooBean children2;
+ }
- static class FooBean {}
+ static class FooBean {
+ @Inject TestBean children2;
+ @Inject FooBean children;
+ }
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-10-21 19:33:17 UTC (rev 35911)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-10-21 19:49:36 UTC (rev 35912)
@@ -10,17 +10,20 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
+import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
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.internal.core.impl.Parameter;
import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
@@ -82,4 +85,23 @@
//Double length of all injected parameter ranges.
assertEquals("Unexpected double length of all injected parameter ranges.", 358, testcount);
}
+
+ public void testFindInjectionPoint2() throws Exception {
+ String path = "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection2.java";
+ Set<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path));
+ Set<IInjectionPoint> ps = new HashSet<IInjectionPoint>();
+ for (IBean b: bs) {
+ ps.addAll(b.getInjectionPoints());
+ }
+ IInjectionPoint[] array = ps.toArray(new IInjectionPoint[ps.size()]);
+ for (int i = 0; i < array.length; i++) {
+ IJavaElement element = array[i] instanceof Parameter
+ ? ((Parameter)array[i]).getDefinition().getVariable()
+ : array[i].getSourceMember();
+ for (int j = 0; j < array.length; j++) {
+ assertEquals(i == j, array[j].isDeclaredFor(element));
+ }
+ }
+ }
+
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35911 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-21 15:33:17 -0400 (Fri, 21 Oct 2011)
New Revision: 35911
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java
Log:
JBIDE-9917
https://issues.jboss.org/browse/JBIDE-9917
Fixed EntityComparator.getComparator is synchronized.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java 2011-10-21 19:13:59 UTC (rev 35910)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java 2011-10-21 19:33:17 UTC (rev 35911)
@@ -17,7 +17,7 @@
public class EntityComparator implements Comparator<XModelObject> {
private static HashMap<String,EntityComparator> comparators = new HashMap<String,EntityComparator>();
- public static EntityComparator getComparator(XModelEntity entity) {
+ public synchronized static EntityComparator getComparator(XModelEntity entity) {
EntityComparator c = (EntityComparator)comparators.get(entity.getName());
if(c == null) {
c = new EntityComparator(entity.getChildren());
13 years, 2 months
JBoss Tools SVN: r35910 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-21 15:13:59 -0400 (Fri, 21 Oct 2011)
New Revision: 35910
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
Log:
JBIDE-9989
https://issues.jboss.org/browse/JBIDE-9989
Fixed CDIUtil.findInjectionPoint()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-21 19:09:41 UTC (rev 35909)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-21 19:13:59 UTC (rev 35910)
@@ -17,11 +17,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeRoot;
@@ -42,7 +38,6 @@
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.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
@@ -169,13 +164,9 @@
for (IBean bean : beans) {
Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints();
for (IInjectionPoint iPoint : injectionPoints) {
- if (element instanceof IField && iPoint instanceof IInjectionPointField) {
- if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName()))
- results.add(iPoint);
- }else if(element instanceof ILocalVariable && iPoint instanceof IInjectionPointParameter){
- if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
- results.add(iPoint);
- }else if(iPoint instanceof IInjectionPointParameter && position != 0){
+ if(element != null && iPoint.isDeclaredFor(element)) {
+ results.add(iPoint);
+ } else if(iPoint instanceof IInjectionPointParameter && position != 0) {
if(iPoint.getStartPosition() <= position && (iPoint.getStartPosition()+iPoint.getLength()) >= position)
results.add(iPoint);
}
13 years, 2 months
JBoss Tools SVN: r35909 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-21 15:09:41 -0400 (Fri, 21 Oct 2011)
New Revision: 35909
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
Log:
JBIDE-9989
https://issues.jboss.org/browse/JBIDE-9989
Fixed CDIUtil.findInjectionPoint()
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-10-21 19:07:38 UTC (rev 35908)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-10-21 19:09:41 UTC (rev 35909)
@@ -5,6 +5,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
@@ -154,4 +155,9 @@
public IBean getBean() {
return null;
}
+
+ @Override
+ public boolean isDeclaredFor(IJavaElement element) {
+ return false;
+ }
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35908 - 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: 2011-10-21 15:07:38 -0400 (Fri, 21 Oct 2011)
New Revision: 35908
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
Log:
JBIDE-9989
https://issues.jboss.org/browse/JBIDE-9244
Fixed CDIUtil.findInjectionPoint()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-10-21 18:30:12 UTC (rev 35907)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-10-21 19:07:38 UTC (rev 35908)
@@ -217,16 +217,9 @@
for (IBean bean : beans) {
Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints();
for (IInjectionPoint iPoint : injectionPoints) {
- if (element instanceof IField && iPoint instanceof IInjectionPointField) {
- if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName()))
+ if (element != null && iPoint.isDeclaredFor(element)) {
return iPoint;
- }else if(element instanceof ILocalVariable && iPoint instanceof IInjectionPointParameter){
- IInjectionPointParameter param = (IInjectionPointParameter)iPoint;
- if (param.getBeanMethod().getMethod().equals(element.getParent())
- && param.getName().equals(element.getElementName())) {
- return iPoint;
- }
- }else if(iPoint instanceof IInjectionPointParameter && position != 0){
+ } else if(iPoint instanceof IInjectionPointParameter && position != 0){
if(iPoint.getStartPosition() <= position && (iPoint.getStartPosition()+iPoint.getLength()) >= position) {
return iPoint;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-10-21 18:30:12 UTC (rev 35907)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-10-21 19:07:38 UTC (rev 35908)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core;
+import org.eclipse.jdt.core.IJavaElement;
import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IJavaSourceReference;
import org.jboss.tools.common.java.IParametedType;
@@ -34,4 +35,12 @@
* @return
*/
IParametedType getMemberType();
+
+ /**
+ * Returns true if this element references the same Java element and false otherwise.
+ *
+ * @param element
+ * @return
+ */
+ boolean isDeclaredFor(IJavaElement element);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2011-10-21 18:30:12 UTC (rev 35907)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2011-10-21 19:07:38 UTC (rev 35908)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.jboss.tools.cdi.core.IBeanField;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
@@ -55,4 +56,16 @@
public String getElementName() {
return getClassBean().getBeanClass().getElementName() + "." + getField().getElementName();
}
+
+ @Override
+ public boolean isDeclaredFor(IJavaElement element) {
+ if(getField() == element) {
+ return true;
+ }
+ if(element instanceof IField && element.exists() && field.exists()) {
+ return element.getElementName().equals(getField().getElementName())
+ && ((IField)element).getDeclaringType().getFullyQualifiedName().equals(getField().getDeclaringType().getFullyQualifiedName());
+ }
+ return false;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2011-10-21 18:30:12 UTC (rev 35907)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2011-10-21 19:07:38 UTC (rev 35908)
@@ -14,6 +14,7 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -118,4 +119,30 @@
public String getElementName() {
return getClassBean().getBeanClass().getElementName() + "." + getMethod().getElementName() + "()"; //$NON-NLS-1$
}
+
+ @Override
+ public boolean isDeclaredFor(IJavaElement element) {
+ if(getMethod() == element) {
+ return true;
+ }
+ if(element instanceof IMethod) {
+ IMethod other = (IMethod)element;
+ return getMethod().getElementName().equals(other.getElementName())
+ && getMethod().getDeclaringType().getFullyQualifiedName().equals(other.getDeclaringType().getFullyQualifiedName())
+ && equalArrays(getMethod().getParameterTypes(), other.getParameterTypes());
+ }
+ return false;
+ }
+
+ private boolean equalArrays(String[] a1, String[] a2) {
+ if(a1.length != a2.length) {
+ return false;
+ }
+ for (int i = 0; i < a1.length; i++) {
+ if(!a1[i].equals(a2[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-10-21 18:30:12 UTC (rev 35907)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-10-21 19:07:38 UTC (rev 35908)
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.ISourceReference;
@@ -109,4 +110,16 @@
public String getElementName() {
return getName();
}
+
+ @Override
+ public boolean isDeclaredFor(IJavaElement element) {
+ if(getDefinition().getVariable() == element) {
+ return true;
+ }
+ if(element instanceof ILocalVariable) {
+ ILocalVariable vThat = (ILocalVariable)element;
+ return getName().equals(vThat.getElementName()) && getBeanMethod().isDeclaredFor(vThat.getDeclaringMember());
+ }
+ return false;
+ }
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35907 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-10-21 14:30:12 -0400 (Fri, 21 Oct 2011)
New Revision: 35907
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
Log:
JBIDE-9949 NPE when close VPE in contextassist
The patch preventing content assist processor updating/acquiring when the editor is closing is applied.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-10-21 18:09:59 UTC (rev 35906)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-10-21 18:30:12 UTC (rev 35907)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2011 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jst.jsp.outline;
@@ -96,14 +96,12 @@
JspELCompletionProposalComputer processor;
int offset = 0;
KbQuery kbQuery, kbQueryAttr;
- @SuppressWarnings("unchecked")
private Set attributeNames = new HashSet();
public JSPPropertySourceAdapter(INodeNotifier target) {
setTarget(target);
}
- @SuppressWarnings("unchecked")
Map getWeights() {
return sorter == null ? new HashMap() : sorter.weights;
}
@@ -124,14 +122,21 @@
}
if(fNode instanceof Node) {
- processor = valueHelper.isFacetets() ? new FaceletsELCompletionProposalComputer() : new JspELCompletionProposalComputer();
-// processor.createContext(getTextViewer(), offset);
- processor.setKeepState(true);
- processor.computeCompletionProposals(new CompletionProposalInvocationContext(getTextViewer(), offset), new NullProgressMonitor());
- pageContext = processor.getContext();
- kbQuery = createKbQuery(processor);
- kbQuery.setMask(true);
- kbQueryAttr = createKbQuery(processor);
+ ITextViewer viewer = getTextViewer();
+ // Jeremy: JBIDE-9949: This prevents invocation of CA Proposals Computation in case
+ // of Text Viewer is not accessible anymore (f.i. in case of closing editor,
+ // since ITexViewer is acquired from Active Page of Active Workbench Window)
+ //
+ if (viewer != null) {
+ processor = valueHelper.isFacetets() ? new FaceletsELCompletionProposalComputer() : new JspELCompletionProposalComputer();
+ // processor.createContext(getTextViewer(), offset);
+ processor.setKeepState(true);
+ processor.computeCompletionProposals(new CompletionProposalInvocationContext(viewer, offset), new NullProgressMonitor());
+ pageContext = processor.getContext();
+ kbQuery = createKbQuery(processor);
+ kbQuery.setMask(true);
+ kbQueryAttr = createKbQuery(processor);
+ }
}
}
@@ -252,7 +257,7 @@
}
else {
String an = attrName;
- if(an.startsWith("xmlns:")) an = "xmlns:*";
+ if(an.startsWith("xmlns:")) an = "xmlns:*"; //$NON-NLS-1$ //$NON-NLS-2$
IAttribute a = as.get(an);
if(a != null) {
descriptor = createJSPPropertyDescriptor(a, attr.getName(), false);
13 years, 2 months
JBoss Tools SVN: r35906 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-21 14:09:59 -0400 (Fri, 21 Oct 2011)
New Revision: 35906
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
Log:
JBIDE-9987
https://issues.jboss.org/browse/JBIDE-9987
Text filter focused on start of Assignable beaans dialog.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-10-21 16:54:44 UTC (rev 35905)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-10-21 18:09:59 UTC (rev 35906)
@@ -299,6 +299,10 @@
});
}
+ protected Control getFocusControl() {
+ return getFilterText();
+ }
+
protected Text getFilterText() {
return fFilterText;
}
13 years, 2 months
JBoss Tools SVN: r35905 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-21 12:54:44 -0400 (Fri, 21 Oct 2011)
New Revision: 35905
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
https://issues.jboss.org/browse/JBIDE-9982 maven depends on examples
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 15:42:25 UTC (rev 35904)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 16:54:44 UTC (rev 35905)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/10/20
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/10/21
------------------------
@@ -44,5 +44,6 @@
(all but common and tests) -> usage
usage -> common, tests
ws -> common
+maven -> examples
------------------------
13 years, 2 months