March 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r29830 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/CDITest1/lib and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-16 17:47:52 -0400 (Wed, 16 Mar 2011) New Revision: 29830 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/some-weld.jar Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java Log: JBIDE-8578 https://issues.jboss.org/browse/JBIDE-8578 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2011-03-16 21:37:53 UTC (rev 29829) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2011-03-16 21:47:52 UTC (rev 29830) @@ -8,5 +8,6 @@ <classpathentry kind="lib" path="lib/weld-core.jar"/> <classpathentry kind="lib" path="lib/weld-se.jar"/> <classpathentry kind="lib" path="lib/weld-servlet.jar"/> + <classpathentry kind="lib" path="lib/some-weld.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/some-weld.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/some-weld.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java 2011-03-16 21:37:53 UTC (rev 29829) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java 2011-03-16 21:47:52 UTC (rev 29830) @@ -52,6 +52,10 @@ p = ps.iterator().next(); inbs = cdi.getBeans(false, p); assertFalse(inbs.isEmpty()); + + //Find bean defined in some-weld.jar + bs = cdi.getBeans("beanInWeldJar", false); + assertEquals(1, bs.size()); } public void tearDown() throws Exception {

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29829 - workspace/snjeza/seam-examples.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-03-16 17:37:53 -0400 (Wed, 16 Mar 2011) New Revision: 29829 Modified: workspace/snjeza/seam-examples/bookingall2.zip Log: JBIDE-8539 Example booking-war has errors on install Modified: workspace/snjeza/seam-examples/bookingall2.zip =================================================================== (Binary files differ)

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29828 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2011-03-16 16:33:01 -0400 (Wed, 16 Mar 2011) New Revision: 29828 Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java Log: https://issues.jboss.org/browse/JBIDE-8487 : Decrease quantity of junit tests - removed *ComponentTest's that are duplicated by *ComponentContentTest's Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -147,7 +147,6 @@ suite.addTestSuite(OpenOnJsf20Test_JBIDE5382.class); suite.addTestSuite(MozDirtyTest_JBIDE5105.class); suite.addTestSuite(VpeI18nTest_JBIDE4887.class); - suite.addTestSuite(JsfComponentTest.class); suite.addTestSuite(JBIDE3519Test.class); suite.addTestSuite(ContextMenuDoubleInsertionTest_JBIDE3888.class); suite.addTestSuite(SelectAllAndCut_JBIDE4853.class); Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -1,216 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.jsf.vpe.jsf.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; - -/** - * Class for testing all jsf components - * - * @author sdzmitrovich - * - */ -public class JsfComponentTest extends VpeTest { - - // import project name - public static final String IMPORT_PROJECT_NAME = "jsfTest"; - - public JsfComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - /* - * JSF HTML test cases - */ - - public void testCommandButton() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/commandButton.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCommandLink() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/commandLink.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/dataTable.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testForm() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/form.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testGraphicImage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/graphicImage.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputHidden() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputHidden.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputSecret() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputSecret.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputText() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputText.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputTextArea() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputTextArea.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMessage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/message.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMessages() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/messages.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testOutputFormat() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputFormat.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testOutputLabel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputLabel.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testOutputLink() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputLink.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testOutputText() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputText.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPanelGrid() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/panelGrid.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPanelGroup() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/panelGroup.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectBooleanCheckbox() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectBooleanCheckbox.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectManyCheckbox() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyCheckbox.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectManyListbox() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyListbox.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectManyMenu() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyMenu.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectOneListbox() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneListbox.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectOneMenu() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneMenu.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectOneRadio() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneRadio.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * JSF Core test cases - */ - - public void testActionListener() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/actionListener.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAttribute() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/attribute.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConvertDateTime() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/convertDateTime.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConvertNumber() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/convertNumber.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConverter() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/converter.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testFacet() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/facet.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLoadBundle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/loadBundle.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testParam() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/param.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPhaseListener() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/phaseListener.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectItem() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectItem.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectItems() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectItems.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSetPropertyActionListener() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/setPropertyActionListener.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSubview() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/subview.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidateDoubleRange() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateDoubleRange.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidateLength() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateLength.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidateLongRange() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateLongRange.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidator() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validator.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValueChangeListener() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/valueChangeListener.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testVerbatim() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/verbatim.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testView() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/view.jsp",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } -} Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -40,7 +40,6 @@ TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON //$NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(RichFacesComponentTest.class); suite.addTestSuite(JBIDE1579Test.class); suite.addTestSuite(Jbide1580Test.class); suite.addTestSuite(JBIDE1613Test.class); Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -1,236 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.richfaces.test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.ui.PartInitException; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; - -/** - * Class for testing all RichFaces components - * - * @author dsakovich(a)exadel.com - * - */ -public class RichFacesComponentTest extends VpeTest { - - public RichFacesComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - - public void testAllComponentsOnSinglePage() throws PartInitException, - Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/richFacesTest.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - public void testCalendar() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/calendar.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataDefinitionList() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataDefinitionList.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataFilterSlider() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataFilterSlider.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataGrid() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataGrid.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataList() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataList.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataOrderedList() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataOrderedList.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataScroller() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/datascroller.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDataTable() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dataTable.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDragAndDrop() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dragAndDrop.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDropDownMenu() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dropDownMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testEffect() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/effect.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testGoogleMap() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/googleMap.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputNumberSlider() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputNumberSlider.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInputNumberSpinner() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/inputNumberSpinner.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInsert() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/insert.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMessage() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/message.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMessages() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/messages.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testModalPanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/modalPanel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testOrderingList() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/orderingList.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPaint2D() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/paint2D.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPanelBar() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelBar.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPanelMenu() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/panelMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testScrollableDataTable() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/scrollableDataTable.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSeparator() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/separator.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSimpleTogglePanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/simpleTogglePanel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSpacer() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/spacer.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSuggestionBox() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/suggestionbox.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTabPanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/tabPanel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTogglePanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/togglePanel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testToolBar() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/toolBar.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTree() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/tree.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testVirtualEarth() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/virtualEarth.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testComponentControl() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/componentControl.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testContextMenu() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/contextMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testListShuttle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/listShuttle.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSubTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/subTable.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void collapsiblePanel() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/collapsiblePanel.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAccordion() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/accordion.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAccordionItem() throws PartInitException, Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/accordionItem.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } -} Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -29,7 +29,6 @@ public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Seam components"); //$NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(SeamComponentTest.class); suite.addTestSuite(SeamComponentContentTest.class); suite.addTestSuite(JBIDE1484Test.class); suite.addTestSuite(OpenOnForDecorateTest.class); Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -1,165 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.seam.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; - -/** - * Class for testing all Seam components - * - * @author dsakovich(a)exadel.com - * - */ -public class SeamComponentTest extends VpeTest { - - public SeamComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - public void testButton() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/button.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCache() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/cache.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConversationId() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/conversationId.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConversationPropagation() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/conversationPropagation.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConvertDateTime() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/convertDateTime.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConvertEntity() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/convertEntity.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testConvertEnum() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/convertEnum.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDecorate() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/decorate.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDefaultAction() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/defaultAction.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDiv() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/div.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testEnumItem() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/enumItem.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testFileUpload() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/fileUpload.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testFormattedText() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/formattedText.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testFragment() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/fragment.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testGraphicImage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/graphicImage.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLabel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/label.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLink() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/link.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMessage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/message.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testRemote() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/remote.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectDate() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/message.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelectItems() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/message.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidate() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validate.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSpan() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/span.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidateAll() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateAll.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testValidateFormattedText() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/validateFormattedText.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTaskId() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/taskId.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAllComponentsOnSinglePage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/seamtest.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - -} Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -34,7 +34,6 @@ TestSuite suite = new TestSuite("Tests for Vpe HTML components"); //$NON-NLS-1$ // $JUnit-BEGIN$ suite.addTestSuite(JBIDE3280Test.class); - suite.addTestSuite(HtmlComponentTest.class); suite.addTestSuite(HtmlComponentContentTest.class); return new VpeTestSetup(suite); Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2011-03-16 19:31:01 UTC (rev 29827) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2011-03-16 20:33:01 UTC (rev 29828) @@ -1,310 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.vpe.html.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; - -/** - * Class for testing all html components - * - * @author Sergey Dzmitrovich - * - */ -public class HtmlComponentTest extends VpeTest { - // import project name - public static final String IMPORT_PROJECT_NAME = "htmlTest"; //$NON-NLS-1$ - - public HtmlComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - /* - * test for block html tags - */ - - public void testDiv() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/div.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDl() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/dl.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLists() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/li.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSpan() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/span.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for core html tags - */ - - public void testA() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/a.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAddress() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/address.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testBody() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/body.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testImg() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/img.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLink() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/link.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testMap() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/map.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testObject() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/object.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testStyle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/style.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTitle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/title.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for form html tags - */ - - public void testButton() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/button.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testFieldset() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/fieldset.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testForm() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/form.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testInput() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/input.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testLabel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/label.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSelect() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/select.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTextArea() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/textArea.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for frames html tags - */ - - public void testFrameset() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/frames/frameset.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testIframe() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/frames/iframe.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for scripts html tags - */ - - public void testScript() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/scripts/script.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for table html tags - */ - - public void testComplexTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/table/complex_table.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/table/table.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /* - * test for text html tags - */ - - public void testAbbr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/abbr.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testAcronym() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/acronym.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testB() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/b.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testBig() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/big.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testBlockquote() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/blockquote.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testBr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/br.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCite() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/cite.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCode() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/code.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/del.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testDfn() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/dfn.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testEm() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/em.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testHr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/hr.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testI() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/i.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testIns() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/ins.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testKbd() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/kbd.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testP() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/p.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testPre() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/pre.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testQ() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/q.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSamp() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/samp.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSmall() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/small.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testStrong() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/strong.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSub() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/sub.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testSup() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/sup.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testTt() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/tt.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testVar() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/var.html", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - -}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29827 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: dialogs and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2011-03-16 15:31:01 -0400 (Wed, 16 Mar 2011) New Revision: 29827 Removed: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/MessageSelectorTypeDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDElementSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDTypeSelectorDialog.java Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java Log: https://issues.jboss.org/browse/JBIDE-8045 Refactored type selection dialogs and properties sections so that the filters are limited to only those types that are valid within the context of the selected variable or property. Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -43,7 +43,9 @@ final public static int INCLUDE_ELEMENT_DECLARATIONS = 0x4; final public static int INCLUDE_PRIMITIVES = 0x8; - final public static int INLCUDE_ALL = 0xff; + // https://issues.jboss.org/browse/JBIDE-8045 + // fix typo + final public static int INCLUDE_ALL = 0xff; static { Iterator i = xsdPrimitiveTypes.iterator(); @@ -53,7 +55,7 @@ } } - private int fFilter = INLCUDE_ALL; + private int fFilter = INCLUDE_ALL; public void setFilter ( int filter ) { Deleted: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/MessageSelectorTypeDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/MessageSelectorTypeDialog.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/MessageSelectorTypeDialog.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.eclipse.bpel.ui.dialogs; - -import org.eclipse.bpel.ui.details.providers.XSDTypeOrElementContentProvider; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -/* - * New class added to support browsing for Message Types only. - * This dialog extends the general-purpose Type Selector but limits the selection - * to known Message Types only. This makes for a less confusing user experience. - * - * @see https://jira.jboss.org/browse/JBIDE-7107 - * @author Bob Brodt - * @date Oct 12, 2010 - */ -public class MessageSelectorTypeDialog extends TypeSelectorDialog { - - public MessageSelectorTypeDialog(Shell parent, EObject eObj) { - super(parent, eObj); - FILTER_TYPES = 0; - showMessages = true; - } - - public void setRequirePartSelection(boolean enabled) - { - this.requireLowerTreeSelection = enabled; - } - - @Override - protected Control createContents(Composite parent) { - // TODO Auto-generated method stub - Control ctl = super.createContents(parent); - checkButtonGroup.setEnabled(false); - for (Control c : checkButtonGroup.getChildren()) - c.setEnabled(false); - return ctl; - } - -} Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -56,6 +56,16 @@ */ public class TypeSelectorDialog extends BrowseSelectorDialog { + + // https://issues.jboss.org/browse/JBIDE-8045 + // additional filters for constraining XSD & message type selections + final public static int INCLUDE_SIMPLE_TYPES = 0x1; + final public static int INCLUDE_COMPLEX_TYPES = 0x2; + final public static int INCLUDE_ELEMENT_DECLARATIONS = 0x4; + final public static int INCLUDE_PRIMITIVES = 0x8; + final public static int INCLUDE_MESSAGE_TYPES = 0x10; + final public static int INCLUDE_ALL = 0xff; + final public static int INCLUDE_XSD_TYPES = INCLUDE_SIMPLE_TYPES | INCLUDE_COMPLEX_TYPES; /* Button id for complex types */ protected final static int BID_COMPLEX_TYPES = IDialogConstants.CLIENT_ID + 100; @@ -88,8 +98,12 @@ /* Which types to filter ? */ - protected int FILTER_TYPES = XSDTypeOrElementContentProvider.INLCUDE_ALL; + protected int FILTER_TYPES = XSDTypeOrElementContentProvider.INCLUDE_ALL; + // https://issues.jboss.org/browse/JBIDE-8045 + /* Which types to include as selections (checkboxes) in dialog ? */ + protected int includeTypes = INCLUDE_ALL; + // https://jira.jboss.org/browse/JBIDE-7107 // set by caller if a selection from the lower tree (typically message parts or XSD elements) // are required before "OK" button can be enabled. @@ -102,10 +116,12 @@ * @param parent the parent shell * @param eObj any BPEL model object */ - - public TypeSelectorDialog (Shell parent, EObject eObj ) { + // https://issues.jboss.org/browse/JBIDE-8045 + // add filter selection parameter + public TypeSelectorDialog (Shell parent, EObject eObj, int filter ) { super(parent, new ModelLabelProvider(eObj)); + this.includeTypes = filter; this.modelObject = eObj; resourceContentProvider = new XSDSchemaFromResourceContentProvider( modelObject.eResource().getResourceSet() ); @@ -127,7 +143,7 @@ try { FILTER_TYPES = settings.getInt(FILTER_TYPES_KEY); } catch (Exception ex) { - FILTER_TYPES = XSDTypeOrElementContentProvider.INLCUDE_ALL; + FILTER_TYPES = XSDTypeOrElementContentProvider.INCLUDE_ALL; } try { @@ -135,14 +151,8 @@ } catch (Exception ex) { showMessages = false; } - - // https://issues.jboss.org/browse/JBIDE-8075 - // enable/disable selection of Message objects - messageTypeProvider.setFilter(showMessages?1:0); } - - /** * Hook a load on the defaults into this dialog upon create. * @@ -153,9 +163,9 @@ Control control = super.createContents(parent); - // Re-Create the state of the provider from the dialog settings. - xsdTypeProvider.setFilter( FILTER_TYPES ); - + // Re-Create the state of the providers from the dialog settings. + setProviderFilters(); + refresh(); return control; @@ -204,7 +214,7 @@ showMessages = checked; // https://issues.jboss.org/browse/JBIDE-8075 // enable/disable selection of Message objects - messageTypeProvider.setFilter(showMessages?1:0); + setProviderFilters(); bRefresh = true; break; @@ -222,7 +232,7 @@ } else { FILTER_TYPES &= ~bits; } - xsdTypeProvider.setFilter (FILTER_TYPES); + setProviderFilters(); } if (bRefresh) { @@ -242,15 +252,21 @@ @Override protected void createBrowseFilterGroupButtons ( Group group ) { - createCheckButton(group,Messages.TypeSelectorDialog_14, BID_XSD_PRIMITIVES, + // https://issues.jboss.org/browse/JBIDE-8045 + if ((includeTypes & INCLUDE_PRIMITIVES) > 0 ) + createCheckButton(group,Messages.TypeSelectorDialog_14, BID_XSD_PRIMITIVES, (FILTER_TYPES & XSDTypeOrElementContentProvider.INCLUDE_PRIMITIVES) > 0 ); - createCheckButton(group,Messages.TypeSelectorDialog_15, BID_SIMPLE_TYPES, + if ((includeTypes & INCLUDE_SIMPLE_TYPES) > 0 ) + createCheckButton(group,Messages.TypeSelectorDialog_15, BID_SIMPLE_TYPES, (FILTER_TYPES & XSDTypeOrElementContentProvider.INCLUDE_SIMPLE_TYPES) > 0 ); - createCheckButton(group,Messages.TypeSelectorDialog_16, BID_COMPLEX_TYPES, + if ((includeTypes & INCLUDE_COMPLEX_TYPES) > 0 ) + createCheckButton(group,Messages.TypeSelectorDialog_16, BID_COMPLEX_TYPES, (FILTER_TYPES & XSDTypeOrElementContentProvider.INCLUDE_COMPLEX_TYPES ) > 0 ); - createCheckButton(group,Messages.TypeSelectorDialog_17, BID_ELEMENT_DECLARATIONS, + if ((includeTypes & INCLUDE_ELEMENT_DECLARATIONS) > 0 ) + createCheckButton(group,Messages.TypeSelectorDialog_17, BID_ELEMENT_DECLARATIONS, (FILTER_TYPES & XSDTypeOrElementContentProvider.INCLUDE_ELEMENT_DECLARATIONS ) > 0 ); - createCheckButton(group,Messages.TypeSelectorDialog_18, BID_MESSAGES, + if ((includeTypes & INCLUDE_MESSAGE_TYPES) > 0 ) + createCheckButton(group,Messages.TypeSelectorDialog_18, BID_MESSAGES, showMessages); super.createBrowseFilterGroupButtons( group ); @@ -335,4 +351,25 @@ { this.requireLowerTreeSelection = enabled; } + + // https://issues.jboss.org/browse/JBIDE-8045 + public void setIncludeTypes(int includeTypes) { + this.includeTypes = includeTypes; + } + + // https://issues.jboss.org/browse/JBIDE-8045 + // update the provider filters for only those types selected and available + private void setProviderFilters() { + + xsdTypeProvider.setFilter( FILTER_TYPES & includeTypes ); + + // https://issues.jboss.org/browse/JBIDE-8075 + // enable/disable selection of Message objects + if ( (includeTypes & INCLUDE_MESSAGE_TYPES) > 0 ) { + messageTypeProvider.setFilter( showMessages ? 1 : 0 ); + } + else { + messageTypeProvider.setFilter( 0 ); + } + } } Deleted: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDElementSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDElementSelectorDialog.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDElementSelectorDialog.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.eclipse.bpel.ui.dialogs; - -import org.eclipse.bpel.ui.details.providers.XSDTypeOrElementContentProvider; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -/* - * New class added to support browsing for XSD Elements only. - * This dialog extends the general-purpose Type Selector but limits the selection - * to known XSD Elements only. This makes for a less confusing user experience. - * - * @see https://jira.jboss.org/browse/JBIDE-7107 - * @author Bob Brodt - * @date Oct 12, 2010 - */ -public class XSDElementSelectorDialog extends TypeSelectorDialog { - - public XSDElementSelectorDialog(Shell parent, EObject eObj) { - super(parent, eObj); - FILTER_TYPES = XSDTypeOrElementContentProvider.INCLUDE_ELEMENT_DECLARATIONS; - showMessages = false; - } - - public void setRequireElementSelection(boolean enabled) - { - this.requireLowerTreeSelection = enabled; - } - - @Override - protected Control createContents(Composite parent) { - // TODO Auto-generated method stub - Control ctl = super.createContents(parent); - checkButtonGroup.setEnabled(false); - for (Control c : checkButtonGroup.getChildren()) - c.setEnabled(false); - return ctl; - } - -} Deleted: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDTypeSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDTypeSelectorDialog.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/XSDTypeSelectorDialog.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.eclipse.bpel.ui.dialogs; - -import org.eclipse.bpel.ui.details.providers.XSDTypeOrElementContentProvider; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -/* - * New class added to support browsing for XSD Simple Types only. - * This dialog extends the general-purpose Type Selector but limits the selection - * to known XSD Simple Types only. This makes for a less confusing user experience. - * - * @see https://jira.jboss.org/browse/JBIDE-7107 - * @author Bob Brodt - * @date Oct 12, 2010 - */ -public class XSDTypeSelectorDialog extends TypeSelectorDialog { - - public XSDTypeSelectorDialog(Shell parent, EObject eObj) { - super(parent, eObj); - FILTER_TYPES = XSDTypeOrElementContentProvider.INCLUDE_TYPES; - showMessages = false; - } - - @Override - protected Control createContents(Composite parent) { - // TODO Auto-generated method stub - Control ctl = super.createContents(parent); - checkButtonGroup.setEnabled(false); - for (Control c : checkButtonGroup.getChildren()) - c.setEnabled(false); - return ctl; - } - -} Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -29,7 +29,8 @@ public class DialogVariableTypeSelector extends VariableTypeSelector { public DialogVariableTypeSelector(Composite parent, int style, BPELEditor bpelEditor, Shell shell, Callback callback, TabbedPropertySheetWidgetFactory wf) { - super(parent, style, bpelEditor, wf, callback, false); + // https://issues.jboss.org/browse/JBIDE-8045 + super(parent, style, bpelEditor, wf, callback); this.shell = shell; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -58,6 +58,7 @@ import org.eclipse.bpel.ui.commands.SetVariableCommand; import org.eclipse.bpel.ui.commands.SetVariableKindCommand; import org.eclipse.bpel.ui.commands.util.AutoUndoCommand; +import org.eclipse.bpel.ui.dialogs.TypeSelectorDialog; import org.eclipse.bpel.ui.uiextensionmodel.VariableExtension; import org.eclipse.bpel.ui.util.BPELUtil; import org.eclipse.bpel.ui.util.BatchedMultiObjectAdapter; @@ -609,8 +610,10 @@ } }); + // https://issues.jboss.org/browse/JBIDE-8045 variableTypeSelector = new VariableTypeSelector(composite, SWT.NONE, getBPELEditor(), - fWidgetFactory, new FaultVariableTypeCallback(), false); + fWidgetFactory, new FaultVariableTypeCallback(), false, + TypeSelectorDialog.INCLUDE_ELEMENT_DECLARATIONS | TypeSelectorDialog.INCLUDE_MESSAGE_TYPES); data = new FlatFormData(); data.top = new FlatFormAttachment(variableNameText, IDetailsAreaConstants.VSPACE+4); data.left = new FlatFormAttachment(0,0); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -18,6 +18,7 @@ import org.eclipse.bpel.ui.commands.CompoundCommand; import org.eclipse.bpel.ui.commands.SetVariableKindCommand; import org.eclipse.bpel.ui.commands.SetVariableTypeCommand; +import org.eclipse.bpel.ui.dialogs.TypeSelectorDialog; import org.eclipse.bpel.ui.uiextensionmodel.VariableExtension; import org.eclipse.bpel.ui.util.BPELUtil; import org.eclipse.bpel.ui.util.BatchedMultiObjectAdapter; @@ -186,8 +187,10 @@ protected void createClient(Composite parent) { Composite composite = parentComposite = createFlatFormComposite(parent); + // https://issues.jboss.org/browse/JBIDE-8045 variableTypeSelector = new VariableTypeSelector(composite, SWT.NONE, getBPELEditor(), - fWidgetFactory, new VariableTypeCallback(), true); + fWidgetFactory, new VariableTypeCallback(), true, + TypeSelectorDialog.INCLUDE_ALL); FlatFormData data = new FlatFormData(); data.top = new FlatFormAttachment(0,0); data.left = new FlatFormAttachment(0,0); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -33,6 +33,7 @@ import org.eclipse.bpel.ui.details.providers.OperationContentProvider; import org.eclipse.bpel.ui.details.providers.PortTypeContentProvider; import org.eclipse.bpel.ui.details.providers.VariableTypeTreeContentProvider; +import org.eclipse.bpel.ui.dialogs.TypeSelectorDialog; import org.eclipse.bpel.ui.uiextensionmodel.VariableExtension; import org.eclipse.bpel.ui.util.BPELUtil; import org.eclipse.bpel.ui.util.BrowseUtil; @@ -133,18 +134,21 @@ protected BPELEditor bpelEditor; protected Callback callback; protected Shell shell; - protected boolean allowElements = false; protected boolean nullFilterAdded = false; + protected int filter = TypeSelectorDialog.INCLUDE_ALL; + protected boolean requireLowerTreeSelection = false; + + // https://issues.jboss.org/browse/JBIDE-8045 + // removed unused "allowElements" param public VariableTypeSelector(Composite parent, int style, BPELEditor bpelEditor, - TabbedPropertySheetWidgetFactory wf, Callback callback, boolean allowElements) + TabbedPropertySheetWidgetFactory wf, Callback callback) { super(parent, style); this.bpelEditor = bpelEditor; this.shell = bpelEditor.getSite().getShell(); this.wf = wf; this.callback = callback; - this.allowElements = allowElements; Composite parentComposite = createComposite(this); this.setLayout(new FillLayout(SWT.VERTICAL)); @@ -157,6 +161,17 @@ createDataTypeWidgets(parentComposite); } + // https://issues.jboss.org/browse/JBIDE-8045 + // new constructor to allow constraining the filter checkboxes to only those types + // valid for the object being defined/modified + public VariableTypeSelector(Composite parent, int style, BPELEditor bpelEditor, + TabbedPropertySheetWidgetFactory wf, Callback callback, boolean requireLowerTreeSelection, int filter) + { + this(parent, style, bpelEditor, wf, callback); + this.filter = filter; + this.requireLowerTreeSelection = requireLowerTreeSelection; + } + /** * Refresh the given CComboViewer, and also make sure selectedObject is selected in it. */ @@ -661,7 +676,9 @@ dataTypeBrowseButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - Object xsdType = BrowseUtil.browseForXSDTypeOrElement(bpelEditor.getProcess(), getShell()); + // https://issues.jboss.org/browse/JBIDE-8045 + Object xsdType = BrowseUtil.browseForVariableType( + bpelEditor.getProcess(), getShell(),requireLowerTreeSelection,filter); if (xsdType != null) { lastChangeContext = DATATYPE_BROWSE_CONTEXT; if (xsdType instanceof XSDTypeDefinition) { Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java 2011-03-16 17:53:52 UTC (rev 29826) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java 2011-03-16 19:31:01 UTC (rev 29827) @@ -10,11 +10,9 @@ *******************************************************************************/ package org.eclipse.bpel.ui.util; -import org.eclipse.bpel.ui.dialogs.MessageSelectorTypeDialog; +import org.eclipse.bpel.ui.dialogs.TypeSelectorDialog; import org.eclipse.bpel.ui.dialogs.PartnerLinkTypeSelectorDialog; import org.eclipse.bpel.ui.dialogs.TypeSelectorDialog; -import org.eclipse.bpel.ui.dialogs.XSDElementSelectorDialog; -import org.eclipse.bpel.ui.dialogs.XSDTypeSelectorDialog; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.window.Window; @@ -39,7 +37,14 @@ } public static Object browseForXSDTypeOrElement(EObject eObject, Shell parent) { - TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject); + // https://issues.jboss.org/browse/JBIDE-8045 + // changed TypeSelectorDialog + TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject, + TypeSelectorDialog.INCLUDE_SIMPLE_TYPES | + TypeSelectorDialog.INCLUDE_COMPLEX_TYPES | + TypeSelectorDialog.INCLUDE_ELEMENT_DECLARATIONS | + TypeSelectorDialog.INCLUDE_PRIMITIVES + ); if (dialog.open() != Window.OK) { return null; } @@ -71,7 +76,10 @@ } public static Object[] browseForXSDType(EObject eObject, Shell parent) { - TypeSelectorDialog dialog = new XSDTypeSelectorDialog (parent,eObject); + // https://issues.jboss.org/browse/JBIDE-8045 + // removed use of specialized selection dialog + TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject, + TypeSelectorDialog.INCLUDE_XSD_TYPES); if (dialog.open() != Window.OK) { return null; } @@ -84,8 +92,11 @@ } public static Object[] browseForXSDElement(EObject eObject, Shell parent, boolean requireElementSelection) { - XSDElementSelectorDialog dialog = new XSDElementSelectorDialog (parent,eObject); - dialog.setRequireElementSelection(requireElementSelection); + // https://issues.jboss.org/browse/JBIDE-8045 + // removed use of specialized selection dialog + TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject, + TypeSelectorDialog.INCLUDE_ELEMENT_DECLARATIONS); + dialog.setRequireLowerTreeSelection(requireElementSelection); if (dialog.open() != Window.OK) { return null; } @@ -98,8 +109,11 @@ } public static Object[] browseForMessageType(EObject eObject, Shell parent, boolean requirePartSelection) { - MessageSelectorTypeDialog dialog = new MessageSelectorTypeDialog (parent,eObject); - dialog.setRequirePartSelection(requirePartSelection); + // https://issues.jboss.org/browse/JBIDE-8045 + // removed use of specialized selection dialog + TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject, + TypeSelectorDialog.INCLUDE_MESSAGE_TYPES); + dialog.setRequireLowerTreeSelection(requirePartSelection); if (dialog.open() != Window.OK) { return null; } @@ -111,4 +125,19 @@ } + + // https://issues.jboss.org/browse/JBIDE-8045 + public static Object[] browseForVariableType(EObject eObject, Shell parent, boolean requireElementSelection, int filter) { + TypeSelectorDialog dialog = new TypeSelectorDialog (parent,eObject,filter); + dialog.setRequireLowerTreeSelection(requireElementSelection); + if (dialog.open() != Window.OK) { + return null; + } + Object obj[] = dialog.getResult(); + if (obj != null && obj.length > 0) { + return obj; + } + return null; + + } }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29826 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-03-16 13:53:52 -0400 (Wed, 16 Mar 2011) New Revision: 29826 Modified: trunk/build/parent/pom.xml Log: add deprecated jbosstools-nightly-trunk profile for existing 3.3_trunk component jobs Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-03-16 17:52:55 UTC (rev 29825) +++ trunk/build/parent/pom.xml 2011-03-16 17:53:52 UTC (rev 29826) @@ -207,7 +207,46 @@ </issueManagement> <profiles> +  <profile> + <id>jbosstools-nightly-trunk</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>jbosstools-nightly</id> + <url>${jbosstools.update.site}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>jbosstools-nightly-staging-composite</id> + <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>jboss-requirements-composite-mirror</id> + <url>http://download.jboss.org/jbosstools/updates/helios/</url> + <layout>p2</layout> + <snapshots> <enabled>true</enabled> </snapshots> + <releases> <enabled>true</enabled> </releases> + </repository> + </repositories> + </profile> + + <profile> <id>jbosstools-nightly</id> <activation> <activeByDefault>true</activeByDefault> @@ -261,7 +300,6 @@ </repositories> </profile> -

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29824 - in branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: propertieseditor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-16 13:31:21 -0400 (Wed, 16 Mar 2011) New Revision: 29824 Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: JBIDE-8596 https://issues.jboss.org/browse/JBIDE-8596 Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 17:22:27 UTC (rev 29823) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 17:31:21 UTC (rev 29824) @@ -380,6 +380,7 @@ public void drop(Properties p) { XModelObject draggedObject = (XModelObject)p.get("draggedObject"); //$NON-NLS-1$ if(draggedObject == null) return; + xtable.getViewer().cancelEditing(); update(); xtable.getViewer().setSelection(new StructuredSelection(draggedObject)); } Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 17:22:27 UTC (rev 29823) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 17:31:21 UTC (rev 29824) @@ -27,11 +27,16 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextOperationTarget; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; @@ -44,6 +49,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IFileEditorInput; @@ -60,6 +66,7 @@ import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; @@ -193,6 +200,19 @@ menu.setViewer(xtable.getViewer()); xtable.getViewer().getTable().addMouseListener(menu); getControl().addMouseListener(menu); + xtable.getViewer().setColumnProperties(new String[]{"name", "value"}); + xtable.getViewer().setCellModifier(new PCellModifier()); + xtable.getViewer().setCellEditors(new CellEditor[]{new TextCellEditor(xtable.getTable()),new TextCellEditor(xtable.getTable())}); + xtable.getTable().addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + if(e.keyCode == 13) { + if(xtable.getViewer().isCellEditorActive()) { + return; + } + if(bar.isEnabled(EDIT)) action(EDIT); + } + } + }); return panel; } @@ -559,6 +579,47 @@ } } +class PCellModifier implements ICellModifier { + + public boolean canModify(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.isAttributeEditable(property); + } + } + return false; + } + + public Object getValue(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.getAttributeValue(property); + } + } + return null; + } + + public void modify(Object element, String property, Object value) { + if(element instanceof TableItem) { + TableItem t = (TableItem)element; + element = t.getData(); + } + if(element instanceof XModelObject && value != null) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + try { + o.getModel().editObjectAttribute(o, property, value.toString()); + } catch (XModelException e) { + ModelUIPlugin.getDefault().logError(e); + } + } + } + } + +} + class FPTableHelper extends AbstractTableHelper implements PropertyChangeListener { PropertiesEditor pe; String nameFilter = ""; //$NON-NLS-1$

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29823 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: propertieseditor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-16 13:22:27 -0400 (Wed, 16 Mar 2011) New Revision: 29823 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 16:34:57 UTC (rev 29822) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 17:22:27 UTC (rev 29823) @@ -380,6 +380,7 @@ public void drop(Properties p) { XModelObject draggedObject = (XModelObject)p.get("draggedObject"); //$NON-NLS-1$ if(draggedObject == null) return; + xtable.getViewer().cancelEditing(); update(); xtable.getViewer().setSelection(new StructuredSelection(draggedObject)); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 16:34:57 UTC (rev 29822) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 17:22:27 UTC (rev 29823) @@ -27,11 +27,16 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextOperationTarget; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; @@ -44,6 +49,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IFileEditorInput; @@ -60,6 +66,7 @@ import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; @@ -193,6 +200,19 @@ menu.setViewer(xtable.getViewer()); xtable.getViewer().getTable().addMouseListener(menu); getControl().addMouseListener(menu); + xtable.getViewer().setColumnProperties(new String[]{"name", "value"}); + xtable.getViewer().setCellModifier(new PCellModifier()); + xtable.getViewer().setCellEditors(new CellEditor[]{new TextCellEditor(xtable.getTable()),new TextCellEditor(xtable.getTable())}); + xtable.getTable().addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + if(e.keyCode == 13) { + if(xtable.getViewer().isCellEditorActive()) { + return; + } + if(bar.isEnabled(EDIT)) action(EDIT); + } + } + }); return panel; } @@ -559,6 +579,47 @@ } } +class PCellModifier implements ICellModifier { + + public boolean canModify(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.isAttributeEditable(property); + } + } + return false; + } + + public Object getValue(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.getAttributeValue(property); + } + } + return null; + } + + public void modify(Object element, String property, Object value) { + if(element instanceof TableItem) { + TableItem t = (TableItem)element; + element = t.getData(); + } + if(element instanceof XModelObject && value != null) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + try { + o.getModel().editObjectAttribute(o, property, value.toString()); + } catch (XModelException e) { + ModelUIPlugin.getDefault().logError(e); + } + } + } + } + +} + class FPTableHelper extends AbstractTableHelper implements PropertyChangeListener { PropertiesEditor pe; String nameFilter = ""; //$NON-NLS-1$

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29822 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-03-16 12:34:57 -0400 (Wed, 16 Mar 2011) New Revision: 29822 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java Log: [JBIDE-8594] enabled handlers when image-/instance-view is active or cloud is selected in cloud viewer, changed handlers to be able to adapt image-/instance-view to DeltaCloud instance Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-16 16:14:16 UTC (rev 29821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-16 16:34:57 UTC (rev 29822) @@ -1,5 +1,10 @@ 2011-03-16 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + * plugin.xml: + * src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java (execute): + * src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java (execute): + [JBIDE-8594] enabled handlers when image-/instance-view is active or cloud is selected in cloud viewer, + changed handlers to be able to adapt image-/instance-view to DeltaCloud instance * src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java: * src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java: * src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-03-16 16:14:16 UTC (rev 29821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-03-16 16:34:57 UTC (rev 29822) @@ -330,41 +330,31 @@ <handler class="org.jboss.tools.deltacloud.ui.commands.FilterImagesHandler" commandId="org.jboss.tools.deltacloud.ui.filterimages"> - <activeWhen> - <with - variable="selection"> - <iterate operator="and"> - <adapt - type="org.jboss.tools.deltacloud.core.DeltaCloud"> - </adapt> - </iterate> - </with> - </activeWhen> <enabledWhen> - <with - variable="selection"> - <count value="+" /> - </with> + <or> + <with + variable="selection"> + <count value="1" /> + </with> + <with variable="activePartId"> + <equals value="org.jboss.tools.deltacloud.ui.views.ImageView"/> + </with> + </or> </enabledWhen> </handler> <handler class="org.jboss.tools.deltacloud.ui.commands.FilterInstancesHandler" commandId="org.jboss.tools.deltacloud.ui.filterinstances"> - <activeWhen> - <with - variable="selection"> - <iterate operator="and"> - <adapt - type="org.jboss.tools.deltacloud.core.DeltaCloud"> - </adapt> - </iterate> - </with> - </activeWhen> <enabledWhen> - <with - variable="selection"> - <count value="+" /> - </with> + <or> + <with + variable="selection"> + <count value="1" /> + </with> + <with variable="activePartId"> + <equals value="org.jboss.tools.deltacloud.ui.views.InstanceView"/> + </with> + </or> </enabledWhen> </handler> </extension> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2011-03-16 16:14:16 UTC (rev 29821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2011-03-16 16:34:57 UTC (rev 29822) @@ -34,8 +34,14 @@ public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { - DeltaCloud cloud = WorkbenchUtils.getFirstAdaptedElement(selection, DeltaCloud.class); - createImagesFilter(cloud, HandlerUtil.getActiveShell(event)); + DeltaCloud deltaCloud = WorkbenchUtils.getFirstAdaptedElement(selection, DeltaCloud.class); + if (deltaCloud != null) { + createImagesFilter(deltaCloud, HandlerUtil.getActiveShell(event)); + } else { + // no item selected: try active part + deltaCloud = WorkbenchUtils.adapt(HandlerUtil.getActivePart(event), DeltaCloud.class); + createImagesFilter(deltaCloud, HandlerUtil.getActiveShell(event)); + } } return Status.OK_STATUS; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java 2011-03-16 16:14:16 UTC (rev 29821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java 2011-03-16 16:34:57 UTC (rev 29822) @@ -35,7 +35,13 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { DeltaCloud deltaCloud = WorkbenchUtils.getFirstAdaptedElement(selection, DeltaCloud.class); - createInstancesFilter(deltaCloud, HandlerUtil.getActiveShell(event)); + if (deltaCloud != null) { + createInstancesFilter(deltaCloud, HandlerUtil.getActiveShell(event)); + } else { + // no item selected: try active part + deltaCloud = WorkbenchUtils.adapt(HandlerUtil.getActivePart(event), DeltaCloud.class); + createInstancesFilter(deltaCloud, HandlerUtil.getActiveShell(event)); + } } return Status.OK_STATUS;

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29821 - branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2011-03-16 12:14:16 -0400 (Wed, 16 Mar 2011) New Revision: 29821 Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/pom.xml Log: OPEN - issue JBIDE-8598: updating pom.xml to correct version issue https://issues.jboss.org/browse/JBIDE-8598 Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/pom.xml =================================================================== --- branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-03-16 16:01:13 UTC (rev 29820) +++ branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-03-16 16:14:16 UTC (rev 29821) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.ws.plugins</groupId> <artifactId>org.jboss.tools.ws.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29820 - trunk/ws/plugins/org.jboss.tools.ws.ui.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2011-03-16 12:01:13 -0400 (Wed, 16 Mar 2011) New Revision: 29820 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml Log: OPEN - issue JBIDE-8598: forgot to update pom.xml when updated plug-in version for ws.ui https://issues.jboss.org/browse/JBIDE-8598 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-03-16 15:59:52 UTC (rev 29819) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-03-16 16:01:13 UTC (rev 29820) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.ws.plugins</groupId> <artifactId>org.jboss.tools.ws.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2011