JBoss Tools SVN: r35261 - trunk/cdi/tests.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-02 10:40:32 -0400 (Sun, 02 Oct 2011)
New Revision: 35261
Modified:
trunk/cdi/tests/pom.xml
Log:
fix profile name (typo) and activation property; fix hudson job to use -Dcdi-coverage instead of -Dcoverage
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2011-10-02 05:57:14 UTC (rev 35260)
+++ trunk/cdi/tests/pom.xml 2011-10-02 14:40:32 UTC (rev 35261)
@@ -27,7 +27,7 @@
</profile>
<profile>
- <id>cdi-tests-deafult</id>
+ <id>cdi-tests-default</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
@@ -52,7 +52,7 @@
<id>cdi-tests-coverage-report</id>
<activation>
<property>
- <name>coverage</name>
+ <name>cdi-coverage</name>
</property>
</activation>
<modules>
11 years, 6 months
JBoss Tools SVN: r35260 - in trunk/xulrunner/plugins: org.mozilla.xulrunner.cocoa.macosx and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-02 01:57:14 -0400 (Sun, 02 Oct 2011)
New Revision: 35260
Modified:
trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties
trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/build.properties
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/build.properties
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/build.properties
trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-8838 add missing source directives to build.properties
Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2011-10-01 01:18:40 UTC (rev 35259)
+++ trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2011-10-02 05:57:14 UTC (rev 35260)
@@ -4,3 +4,5 @@
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/build.properties 2011-10-01 01:18:40 UTC (rev 35259)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/build.properties 2011-10-02 05:57:14 UTC (rev 35260)
@@ -3,4 +3,5 @@
src.includes = xulrunner/,\
build.properties,\
META-INF/
-
+output.. = bin/
+source.. = src/
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/build.properties 2011-10-01 01:18:40 UTC (rev 35259)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/build.properties 2011-10-02 05:57:14 UTC (rev 35260)
@@ -1,2 +1,6 @@
bin.includes = xulrunner/,\
META-INF/
+output.. = bin/
+source.. = src/
+src.includes = *
+src.excludes = src
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/build.properties 2011-10-01 01:18:40 UTC (rev 35259)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/build.properties 2011-10-02 05:57:14 UTC (rev 35260)
@@ -1,2 +1,6 @@
bin.includes = xulrunner/,\
META-INF/
+output.. = bin/
+source.. = src/
+src.includes = *
+src.excludes = src
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/build.properties 2011-10-01 01:18:40 UTC (rev 35259)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/build.properties 2011-10-02 05:57:14 UTC (rev 35260)
@@ -1,2 +1,6 @@
bin.includes = xulrunner/,\
META-INF/
+output.. = bin/
+source.. = src/
+src.includes = *
+src.excludes = src
11 years, 6 months
JBoss Tools SVN: r35259 - in trunk/common/plugins: org.jboss.tools.common.model and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-30 21:18:40 -0400 (Fri, 30 Sep 2011)
New Revision: 35259
Removed:
trunk/common/plugins/org.jboss.tools.common.model/.settings/
trunk/common/plugins/org.jboss.tools.common/.settings/
Modified:
trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
Log:
fixed compilation errors
Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-10-01 01:10:20 UTC (rev 35258)
+++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-10-01 01:18:40 UTC (rev 35259)
@@ -85,5 +85,5 @@
org.eclipse.core.runtime;visibility:=reexport;bundle-version="3.7.0",
org.eclipse.core.filesystem
Bundle-Version: 3.3.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: org.jboss.tools.common.model.jar
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-10-01 01:10:20 UTC (rev 35258)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-10-01 01:18:40 UTC (rev 35259)
@@ -25,4 +25,4 @@
org.jboss.tools.common.ui.wizard
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
11 years, 6 months
JBoss Tools SVN: r35256 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-30 21:08:44 -0400 (Fri, 30 Sep 2011)
New Revision: 35256
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/src/org/jboss/tools/jsf/vpe/myfaces/template/VpeMyFacesDataScrollerTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
Log:
https://issues.jboss.org/browse/JBIDE-9807 testForSimpleText & testForElText
code cleanup after debugging
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/src/org/jboss/tools/jsf/vpe/myfaces/template/VpeMyFacesDataScrollerTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/src/org/jboss/tools/jsf/vpe/myfaces/template/VpeMyFacesDataScrollerTemplate.java 2011-10-01 01:05:15 UTC (rev 35255)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/src/org/jboss/tools/jsf/vpe/myfaces/template/VpeMyFacesDataScrollerTemplate.java 2011-10-01 01:08:44 UTC (rev 35256)
@@ -112,10 +112,6 @@
public void removeAttribute(VpePageContext pageContext, Element sourceElement, Document visualDocument, Node visualNode, Object data, String name) {
}
- public String[] getOutputAttributeNames() {
- return null;
- }
-
/* (non-Javadoc)
* @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getOutputTextNode(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, java.lang.Object)
*/
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2011-10-01 01:05:15 UTC (rev 35255)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2011-10-01 01:08:44 UTC (rev 35256)
@@ -920,7 +920,7 @@
if (nm instanceof VpeElementMapping) {
VpeElementMapping mapping = (VpeElementMapping)nm;
String[] names = mapping.getTemplate().getOutputAttributeNames();
- if(names!=null) {
+ if(names.length>0) {
String name = names[0];
return (Attr)node.getAttributes().getNamedItem(name);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-10-01 01:05:15 UTC (rev 35255)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-10-01 01:08:44 UTC (rev 35256)
@@ -118,6 +118,8 @@
/** The Constant ATTR_PSEUDOCONTENT_ATTRNAME. */
private static final String ATTR_PSEUDOCONTENT_ATTRNAME = "attrName"; //$NON-NLS-1$
+ protected static final String[] EMPTY_ARRAY = new String[0];;
+
/** The breaker type. */
private int breakerType = BREAKER_TYPE_NONE;
@@ -1120,7 +1122,7 @@
* @return attrubute name array
*/
public String[] getOutputAttributeNames() {
- return null;
+ return EMPTY_ARRAY;
}
/**
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2011-10-01 01:05:15 UTC (rev 35255)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2011-10-01 01:08:44 UTC (rev 35256)
@@ -154,7 +154,7 @@
creatorInfo.addChildrenInfo(info);
String columnClasses = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_COLUMN_CLASSES);
- if (null != columnClasses) {
+ if (null != columnClasses && cell != null) {
setColumnClassesToCell(cell, columnClasses, index);
}
visualColumnElements.setBodyCell(cell);
@@ -227,47 +227,28 @@
* @param columnClasses the column classes
* @param index the index of the column in the table
*/
- private void setColumnClassesToCell(nsIDOMElement cell,
- String columnClasses, int index) {
- if (cell != null) {
- String[] classes = splitClasses(columnClasses);
- if ((null != classes) && (classes.length > 0)) {
- int classesCount = classes.length;
- int columnCount = index + 1;
- String className = ""; //$NON-NLS-1$
-
- // Finds correct css style class index
- // for the column
- if (columnCount <= classesCount) {
- className = classes[columnCount - 1];
- } else {
- int remainder = columnCount % classesCount;
- int classesIndex = ((0 == remainder) ? (classesCount-1) : (remainder-1));
- className = classes[classesIndex];
- }
- if (className.trim().length() > 0) {
- cell.setAttribute("class", className); //$NON-NLS-1$
- }
+ private void setColumnClassesToCell(nsIDOMElement cell,String columnClasses, int index) {
+ String[] classes = columnClasses.split(",");
+ if (classes.length > 0) {
+ int classesCount = classes.length;
+ int columnCount = index + 1;
+ String className = ""; //$NON-NLS-1$
+ // Finds correct css style class index
+ // for the column
+ if (columnCount <= classesCount) {
+ className = classes[columnCount - 1];
+ } else {
+ int remainder = columnCount % classesCount;
+ int classesIndex = ((0 == remainder) ? (classesCount-1) : (remainder-1));
+ className = classes[classesIndex];
}
-
+ if (className.trim().length() > 0) {
+ cell.setAttribute("class", className); //$NON-NLS-1$
+ }
}
}
/**
- * Splits a sequence of classes to an array of separate classes.
- *
- * @param value the sequence of classes
- *
- * @return the array of separate classes
- */
- private String[] splitClasses(String value) {
- if (value != null) {
- return value.split(","); //$NON-NLS-1$
- }
- return null;
- }
-
- /**
* Sets the css class to the cell.
*
* @param cell the cell
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2011-10-01 01:05:15 UTC (rev 35255)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2011-10-01 01:08:44 UTC (rev 35256)
@@ -367,7 +367,7 @@
return ((VpeOutputAttributes)creators[i]).getOutputAttributes();
}
}
- return null;
+ return EMPTY_ARRAY;
}
@Override
public nsIDOMText getOutputTextNode(VpePageContext pageContext, Element sourceElement, Object data) {
11 years, 6 months
JBoss Tools SVN: r35255 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-30 21:05:15 -0400 (Fri, 30 Sep 2011)
New Revision: 35255
Added:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/AssignableBeansDialogTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Test is added.
Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/AssignableBeansDialogTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/AssignableBeansDialogTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/AssignableBeansDialogTest.java 2011-10-01 01:05:15 UTC (rev 35255)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.text.ext.test;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters;
+import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeansDialog;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class AssignableBeansDialogTest extends TCKTest {
+
+ public AssignableBeansDialogTest() {}
+
+ public void testAssignableBeansDialog() {
+ String path = "JavaSource/org/jboss/jsr299/tck/tests/jbt/lookup/ObjectInjection.java";
+ IFile file = tckProject.getFile(path);
+ assertTrue(file.exists());
+ IInjectionPointField injectionPoint = getInjectionPointField(path, "object");
+
+ Display display = Display.getCurrent();
+ if(display == null) {
+ display = Display.getDefault();
+ }
+ AssignableBeansDialog dialog = new AssignableBeansDialog(display.getActiveShell());
+ dialog.setBlockOnOpen(false);
+ dialog.setInjectionPoint(injectionPoint);
+ dialog.open();
+
+ List<IBean> bs = dialog.getDisplayedBeans();
+ int allBeans = bs.size();
+ for (int i = 0; i < AssignableBeanFilters.ALL_OPTIONS.length; i++) {
+ dialog.setFilterEnabled(i, true);
+ }
+ for (int i = 0; i < AssignableBeanFilters.ALL_OPTIONS.length; i++) {
+ boolean b = dialog.isFilterEnabled(i);
+ dialog.setFilterEnabled(i, !b);
+ bs = dialog.getDisplayedBeans();
+ assertTrue(bs.size() < allBeans);
+ dialog.setFilterEnabled(i, b);
+ }
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/AssignableBeansDialogTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2011-10-01 00:58:47 UTC (rev 35254)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2011-10-01 01:05:15 UTC (rev 35255)
@@ -24,9 +24,10 @@
ValidationFramework.getDefault().suspendAllValidation(true);
- TestSuite suiteAll = new TestSuite("CDI Core Tests");
+ TestSuite suiteAll = new TestSuite("CDI Text Ext Tests");
TestSuite suite = new TestSuite("CDI OpenOns Tests");
+ suite.addTestSuite(AssignableBeansDialogTest.class);
suite.addTestSuite(InjectedPointHyperlinkDetectorTest.class);
suite.addTestSuite(ProducerDisposerHyperlinkDetectorTest.class);
suite.addTestSuite(EventAndObserverMethodHyperlinkDetectorTest.class);
11 years, 6 months
JBoss Tools SVN: r35254 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-30 20:58:47 -0400 (Fri, 30 Sep 2011)
New Revision: 35254
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObjectInjection.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Test resource added.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObjectInjection.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObjectInjection.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObjectInjection.java 2011-10-01 00:58:47 UTC (rev 35254)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.lookup;
+
+import javax.inject.Inject;
+import javax.enterprise.inject.Any;
+
+public class ObjectInjection {
+ @Inject @Any Object object;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObjectInjection.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
11 years, 6 months
JBoss Tools SVN: r35253 - 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-09-30 20:57:44 -0400 (Fri, 30 Sep 2011)
New Revision: 35253
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java
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/AssignableBeansHyperlink.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Testing feature added to dialog; specialized beans filter fixed.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java 2011-10-01 00:51:22 UTC (rev 35252)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java 2011-10-01 00:57:44 UTC (rev 35253)
@@ -33,13 +33,13 @@
public void filter(Set<IBean> beans);
}
- static int OPTION_UNAVAILABLE_BEANS = 1;
- static int OPTION_DECORATOR = 2;
- static int OPTION_INTERCEPTOR = 3;
- static int OPTION_UNSELECTED_ALTERNATIVE = 4;
- static int OPTION_PRODUCER_IN_UNAVAILABLE_BEAN = 5;
- static int OPTION_SPECIALIZED_BEAN = 6;
- static int OPTION_ELIMINATED_AMBIGUOUS = 7;
+ public static int OPTION_UNAVAILABLE_BEANS = 1;
+ public static int OPTION_DECORATOR = 2;
+ public static int OPTION_INTERCEPTOR = 3;
+ public static int OPTION_UNSELECTED_ALTERNATIVE = 4;
+ public static int OPTION_PRODUCER_IN_UNAVAILABLE_BEAN = 5;
+ public static int OPTION_SPECIALIZED_BEAN = 6;
+ public static int OPTION_ELIMINATED_AMBIGUOUS = 7;
public static class Checkbox {
int id;
@@ -134,12 +134,15 @@
public static class SpecializedBeanFilter implements Filter {
public void filter(Set<IBean> beans) {
Iterator<IBean> it = beans.iterator();
+ Set<IBean> specialized = new HashSet<IBean>();
while(it.hasNext()) {
IBean b = it.next();
- if(b instanceof IClassBean && !((IClassBean) b).getSpecializingBeans().isEmpty()) {
- it.remove();
+ IBean bean = b.getSpecializedBean();
+ if(bean != null) {
+ specialized.add(bean);
}
}
+ beans.removeAll(specialized);
}
}
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-01 00:51:22 UTC (rev 35252)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-10-01 00:57:44 UTC (rev 35253)
@@ -80,6 +80,7 @@
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.util.BeanPresentationUtil;
import org.jboss.tools.cdi.internal.core.impl.AbstractBeanElement;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters.Checkbox;
import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters.Filter;
@@ -176,6 +177,11 @@
return fViewMenuButtonComposite;
}
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
+ }
+
protected Control createDialogArea(Composite parent) {
composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
@@ -347,6 +353,9 @@
if(display == null) {
display = Display.getDefault();
}
+ if(display.getActiveShell() == null) {
+ return super.getDefaultLocation(size);
+ }
Rectangle b = display.getActiveShell().getBounds();
int x = b.x + (b.width - size.x) / 2;
int y = b.y + (b.height - size.y) / 2;
@@ -386,7 +395,32 @@
}
}
+ public List<IBean> getDisplayedBeans() {
+ List<IBean> bs = new ArrayList<IBean>();
+ int index = 0;
+ while(true) {
+ Object o = list.getElementAt(index);
+ if(o instanceof IBean) {
+ bs.add((IBean)o);
+ } else {
+ break;
+ }
+ index++;
+ }
+ return bs;
+ }
+ public boolean isFilterEnabled(int index) {
+ return AssignableBeanFilters.ALL_OPTIONS[index].state;
+ }
+
+ public void setFilterEnabled(int index, boolean value) {
+ AssignableBeanFilters.ALL_OPTIONS[index].state = value;
+ filterView.refresh();
+// filterView.setChecked(AssignableBeanFilters.ALL_OPTIONS[index], value);
+ list.refresh();
+ }
+
class ShowHideAction extends Action {
public ShowHideAction() {
super("Show/Hide panel", Action.AS_CHECK_BOX);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-10-01 00:51:22 UTC (rev 35252)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-10-01 00:57:44 UTC (rev 35253)
@@ -42,8 +42,6 @@
}
AssignableBeansDialog dialog = new AssignableBeansDialog(display.getActiveShell());
dialog.setInjectionPoint(injectionPoint);
- dialog.create();
- dialog.getShell().setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
dialog.open();
}
11 years, 6 months
JBoss Tools SVN: r35252 - trunk/xulrunner/plugins/org.mozilla.xpcom.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-30 20:51:22 -0400 (Fri, 30 Sep 2011)
New Revision: 35252
Added:
trunk/xulrunner/plugins/org.mozilla.xpcom/src/
Modified:
trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath
trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties
Log:
added source folder to fix compilation error
Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath 2011-10-01 00:47:00 UTC (rev 35251)
+++ trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath 2011-10-01 00:51:22 UTC (rev 35252)
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="MozillaGlue.jar"/>
- <classpathentry exported="true" kind="lib" path="MozillaInterfaces.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="lib" path="MozillaGlue.jar"/>
+ <classpathentry exported="true" kind="lib" path="MozillaInterfaces.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2011-10-01 00:47:00 UTC (rev 35251)
+++ trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2011-10-01 00:51:22 UTC (rev 35252)
@@ -1,3 +1,6 @@
bin.includes = META-INF/,\
MozillaGlue.jar,\
MozillaInterfaces.jar
+jars.compile.order = .
+source.. = src/
+output.. = bin/
11 years, 6 months