December 2011 - jbosstools-commits

JBoss Tools SVN: r37602 - in trunk/jsf: plugins/org.jboss.tools.jsf.doc.user and 13 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-12-30 16:38:22 -0500 (Fri, 30 Dec 2011) New Revision: 37602 Removed: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name Modified: trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java trunk/jsf/tests/pom.xml Log: removed jsf.test dependency from jsf.ui.test plugin to avoid skipping tests from jsf.ui.test in case of test errors in jsf.test Modified: trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,29 +1,105 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.tools.jsf.test.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider"> +<feature + id="org.jboss.tools.jsf.test.feature" + label="%featureName" + version="3.3.0.qualifier" + provider-name="%featureProvider"> - <description> + <description> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="%licenseURL"> + <license url="%licenseURL"> %license </license> - <plugin id="org.jboss.tools.jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.text.ext.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.ui.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.verification.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.ajax4jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.facelets.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jbpm.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jstl.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.myfaces.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.richfaces.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.seam.test" download-size="0" install-size="0" version="0.0.0" /> + <plugin + id="org.jboss.tools.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui.bot.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.verification.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jbpm.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jstl.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.base.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,7 +1,4 @@ -source.. = -output.. = bin/ bin.includes = META-INF/,\ - .,\ toc.xml,\ plugin.xml,\ doc.zip,\ @@ -11,3 +8,17 @@ PaletteContextHelp.xml,\ JSFContextHelp.xml,\ plugin.properties +jars.compile.order = +src.includes = JSFContextHelp.xml,\ + .project,\ + META-INF/,\ + PaletteContextHelp.xml,\ + StrutsContextHelp.xml,\ + TilesContextHelp.xml,\ + VPEContextHelp.xml,\ + doc.zip,\ + plugin.properties,\ + plugin.xml,\ + plugin_ja.properties,\ + pom.xml,\ + toc.xml Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-12-30 21:38:22 UTC (rev 37602) @@ -2,6 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jsf.test;singleton:=true +Eclipse-BundleShape: dir Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: lib/xmlunit1.0.jar, . @@ -45,7 +46,8 @@ org.eclipse.jst.jsf.common, org.jboss.tools.jst.web.kb.test, org.jboss.tools.common.validation, - org.jboss.tools.common.base.test + org.jboss.tools.common.base.test, + org.jboss.tools.jsf.base.test;bundle-version="3.3.0" Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -15,18 +15,4 @@ <emma.filter>org.jboss.tools.jsf*</emma.filter> <emma.instrument.bundles>org.jboss.tools.jsf</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <configuration> - <explodedBundles combine.children="append"> - <bundle>org.jboss.tools.jsf.test</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -43,7 +43,7 @@ TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName()); jsf2.addTestSuite(JSF2ModelTest.class); ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2, - "org.jboss.tools.jsf.test", + "org.jboss.tools.jsf.base.test", new String[]{"projects/JSF2Beans", "projects/JSF2Web"}, new String[]{"JSF2Beans", "JSF2Web"}); suite.addTest(testSetup); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.jsf.ui.test +Bundle-SymbolicName: org.jboss.tools.jsf.ui.test;singleton:=true Bundle-Version: 3.3.0.qualifier +Eclipse-BundleShape: dir Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.junit, org.jboss.tools.tests, @@ -28,7 +29,6 @@ org.jboss.tools.jst.web, org.jboss.tools.jst.web.kb, org.jboss.tools.jsf, - org.jboss.tools.jsf.test, org.eclipse.jst.standard.schemas, org.jboss.tools.vpe.ui.palette, org.eclipse.gef, @@ -40,6 +40,7 @@ org.jboss.tools.common.el.ui, org.eclipse.jdt.ui, org.jboss.tools.common.ui, - org.jboss.tools.common.gef + org.jboss.tools.common.gef, + org.jboss.tools.jsf.base.test;bundle-version="3.3.0" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2011-12-30 21:38:22 UTC (rev 37602) @@ -2,6 +2,7 @@ bin.includes = META-INF/,\ plugin.properties,\ projects/,\ - . + .,\ + plugin.xml jars.compile.order = . source.. = src/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath 2011-12-30 21:38:22 UTC (rev 37602) @@ -3,13 +3,8 @@ <classpathentry kind="src" path="JavaSource"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> - <attribute name="owner.project.facets" value="jst.web"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"> - <attributes> <attribute name="owner.project.facets" value="jst.java"/> </attributes> </classpathentry> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-12-30 21:38:22 UTC (rev 37602) @@ -20,11 +20,6 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="Apache Tomcat v6.0"/> <fixed facet="jst.web"/> <fixed facet="jst.java"/> <installed facet="jst.java" version="5.0"/> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -Window \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath 2011-12-30 21:38:22 UTC (rev 37602) @@ -3,15 +3,10 @@ <classpathentry kind="src" path="JavaSource"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> - <attribute name="owner.project.facets" value="jst.web"/> + <attribute name="owner.project.facets" value="java"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"> - <attributes> - <attribute name="owner.project.facets" value="jst.java"/> - </attributes> - </classpathentry> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> </classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-12-30 21:38:22 UTC (rev 37602) @@ -20,11 +20,6 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="Apache Tomcat v6.0"/> <fixed facet="jst.java"/> <fixed facet="jst.web"/> <installed facet="jst.java" version="5.0"/> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -Window \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -21,7 +21,7 @@ @Override public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy); + provider = new TestProjectProvider("org.jboss.tools.jsf.base.test", null, PROJECT_NAME, makeCopy); project = provider.getProject(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -10,7 +10,7 @@ private static final String PAGE_NAME = "/src/test/beans/inputname.xhtml"; public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy); + provider = new TestProjectProvider("org.jboss.tools.jsf.base.test", null, PROJECT_NAME, makeCopy); project = provider.getProject(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -134,17 +134,17 @@ new String[] { "JsfJbide1704Test" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - ELTooltipTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + ELTooltipTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ @@ -154,16 +154,15 @@ new String[] { "Jbide3845Test" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ -// return new TestWizardsProject(suite); return suite; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; @@ -41,6 +42,7 @@ protected NaturesInfoDialogTest(String name) { super(name); + JsfUiPlugin.getDefault(); } protected final class ResultObject { @@ -117,8 +119,6 @@ isCheckNeed = false; assertNotNull("Editor is not opened", part); //$NON-NLS-1$ - - TestUtil.delay(3000); } Modified: trunk/jsf/tests/pom.xml =================================================================== --- trunk/jsf/tests/pom.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/pom.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -47,6 +47,7 @@ <module>org.jboss.tools.jsf.vpe.myfaces.test</module> <module>org.jboss.tools.jsf.vpe.richfaces.test</module> <module>org.jboss.tools.jsf.vpe.seam.test</module> + <module>org.jboss.tools.jsf.base.test</module> </modules> </profile>

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37601 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-12-30 15:38:37 -0500 (Fri, 30 Dec 2011) New Revision: 37601 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java Log: System.out.print removed. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2011-12-30 20:23:09 UTC (rev 37600) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2011-12-30 20:38:37 UTC (rev 37601) @@ -257,11 +257,10 @@ if(folder instanceof FolderImpl) { String path = WebProject.getInstance(cs[i].getModel()).getPathInWebRoot(cs[i]); if(uri == null) { - System.out.println("-->Null uri"); - System.out.println(cs[i]); - System.out.println(cs[i].getModelEntity().getName()); - } else - if(path != null) resolvedURIs.put(path, uri); + WebModelPlugin.getDefault().logWarning("TaglibMapping: null 'uri' from object " + cs[i].getModelEntity().getName()); //$NON-NLS-1$ + } else { + if(path != null) resolvedURIs.put(path, uri); + } } addLocation(uri, location); taglibObjects.put(uri, cs[i]);

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37600 - trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/selectpath.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-12-30 15:23:09 -0500 (Fri, 30 Dec 2011) New Revision: 37600 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/selectpath/PathEditorAdapter.java Log: JBIDE-10576 https://issues.joss.org/browse/JBIDE-10576 Linking capability is moved from StringButtonFieldEditorEx to basic ExtendedFieldEditor. Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/selectpath/PathEditorAdapter.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/selectpath/PathEditorAdapter.java 2011-12-30 20:21:49 UTC (rev 37599) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/selectpath/PathEditorAdapter.java 2011-12-30 20:23:09 UTC (rev 37600) @@ -13,21 +13,16 @@ import java.util.*; import org.jboss.tools.common.meta.*; import org.jboss.tools.common.meta.action.*; -import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintProperties; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.struts.model.helpers.*; import org.jboss.tools.struts.model.helpers.path.*; import org.jboss.tools.common.model.ui.actions.IActionProvider; -import org.jboss.tools.struts.ui.StrutsUIPlugin; import org.jboss.tools.struts.webprj.model.helpers.WebModulesHelper; import org.jboss.tools.struts.webprj.pattern.UrlPattern; import org.jboss.tools.common.model.ui.*; import org.jboss.tools.common.model.ui.attribute.adapter.*; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.widgets.Control; public class PathEditorAdapter extends DefaultValueAdapter implements IActionHelper { @@ -37,13 +32,11 @@ protected String attrname = ""; Set<String> tiles = new TreeSet<String>(); ActionsTree actions = null; - Properties p = null; public void dispose() { super.dispose(); if (tiles!=null) tiles.clear(); tiles = null; - p = null; if (actions!=null) actions.dispose(); actions = null; } @@ -59,23 +52,19 @@ public Object getAdapter(Class adapter) { if (adapter == IActionHelper.class) return this; - if (adapter == IActionProvider.class) return actionProvider; return super.getAdapter(adapter); } public void setConstraints(XAttribute a, XModelObject o) { XAttribute attr = a; attrname = attr.getName(); - if(a.getConstraint() instanceof XAttributeConstraintProperties) { - p = ((XAttributeConstraintProperties)a.getConstraint()).getProperties(); - } object = o; if(object != null && isTileDefinition(object)) { contextProcess = object; } else { updateContextProcess(); } - createActionProvider(); + getActionProvider(); } private boolean isTileDefinition(XModelObject o) { @@ -158,60 +147,4 @@ //link action support - private IActionProvider actionProvider; - private XActionWrapper labelAction; - - private void createActionProvider() { - actionProvider = new ActionProvider(); - String actionPath = (p == null) ? null : p.getProperty("linkAction"); - XAction xaction = (actionPath == null) ? null : XActionInvoker.getAction(actionPath, modelObject); - labelAction = (xaction != null) ? new XActionWrapper(xaction) : null; - if(labelAction != null) labelAction.setXModelObject(object); - } - - class XActionWrapper extends Action { - private XAction xaction = null; -// private XModelObject xmo = null; - - public XActionWrapper(XAction xaction) { - this.xaction = xaction; - } - - public void setXModelObject(XModelObject xmo) { -// this.xmo = xmo; - if (xmo!=null && xaction!=null) { - this.setEnabled(xaction.isEnabled(xmo)); - this.setEnabled(Boolean.TRUE.booleanValue()); - } else { - this.setEnabled(Boolean.FALSE.booleanValue()); - } - } - - public void run() { - if (xaction!=null) { - try { - XActionInvoker.invoke(xaction.getPath(), modelObject, new Properties()); - } catch (Exception e) { - StrutsUIPlugin.getPluginLog().logError(e); - } - } - } - } - - class ActionProvider implements IActionProvider { - private static final String STRING_BUTTON_ACTION = "Label.Selected"; - - public IAction getAction(String actionName) { - if (STRING_BUTTON_ACTION.equals(actionName)) { - return labelAction; - } - return null; - } - - public IAction[] getActions() { - return new IAction[] {labelAction}; - } - public void update(ISelection selection) {} - } - }

12 years, 4 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-12-30 15:21:49 -0500 (Fri, 30 Dec 2011) New Revision: 37599 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultComboBoxValueAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringButtonFieldEditorEx.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java Log: JBIDE-10576 https://issues.joss.org/browse/JBIDE-10576 Linking capability is moved from StringButtonFieldEditorEx to basic ExtendedFieldEditor. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultComboBoxValueAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultComboBoxValueAdapter.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultComboBoxValueAdapter.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -14,6 +14,7 @@ import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; +import org.jboss.tools.common.model.ui.actions.IActionProvider; import org.jboss.tools.common.model.ui.attribute.IListContentProvider; import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.ILabelProvider; @@ -63,6 +64,9 @@ } return this.listContentProvider; } + if (adapter == IActionProvider.class) { + return getActionProvider(); + } Assert.isTrue(true, "DefaultValueAdapter instance itself cannot provide adapter for "+adapter.getName()); //$NON-NLS-1$ return null; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionAdapter.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionAdapter.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -20,14 +20,14 @@ import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; -import org.jboss.tools.common.model.ui.ModelUIMessages; import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -45,10 +45,8 @@ import org.jboss.tools.common.model.ui.actions.IActionProvider; public class DefaultTreeSelectionAdapter extends DefaultValueAdapter implements IAdaptable, ISelectionProvider, ISelectionChangedListener { + public static final String LINK_ACTION = "linkAction"; //$NON-NLS-1$ - private static final String STRING_BUTTON_ACTION = "Label.Selected"; //$NON-NLS-1$ - private static final String STRING_BUTTON_XACTION = "linkAction"; //$NON-NLS-1$ - protected ILabelProvider labelProvider; protected ITreeContentProvider treeContentProvider; @@ -162,40 +160,13 @@ private ActionProvider actionProvider; private XActionWrapper labelAction; - private ActionProvider getActionProvider() { - if (this.actionProvider==null) this.actionProvider = new ActionProvider(); + protected ActionProvider getActionProvider() { + if (this.actionProvider == null) { + this.actionProvider = new ActionProvider(); + } return this.actionProvider; } - class XActionWrapper extends Action { - - private XAction xaction = null; - - public XActionWrapper(XAction xaction) { - this.xaction = xaction; - } - - public void setXModelObject(XModelObject xmo) { - if (xmo != null && xaction != null) { -// this.setEnabled(xaction.isEnabled(xmo)); - this.setEnabled(Boolean.TRUE.booleanValue()); - } else { - this.setEnabled(Boolean.FALSE.booleanValue()); - } - } - - public void run() { - if (xaction != null) { - if(xaction.isEnabled(getModelObject())) { - XActionInvoker.invoke(xaction.getPath(), modelObject, new Properties()); - } else { - Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - MessageDialog.openWarning(shell, "Warning", "Resource does not exist."); - } - } - } - } - class ActionProvider implements IActionProvider { private HashMap<String,IAction> actions = new HashMap<String,IAction>(); @@ -239,7 +210,7 @@ private void initActions() { treeContentProvider = getTreeContentProvider(); if (treeContentProvider instanceof DefaultXAttributeTreeContentProvider) { - String linkActionName = ((DefaultXAttributeTreeContentProvider)treeContentProvider).getProperties().getProperty(STRING_BUTTON_XACTION); + String linkActionName = ((DefaultXAttributeTreeContentProvider)treeContentProvider).getProperties().getProperty(LINK_ACTION); if (linkActionName!=null) { XAction xAction = XActionInvoker.getAction(linkActionName, modelObject); if (xAction!=null) { @@ -249,7 +220,7 @@ // XModelObject object = (XModelObject)getObjectByPath(this.getStringValue(Boolean.TRUE.booleanValue())); // linkAction.setXModelObject(object); linkAction.setEnabled(true); - getActionProvider().putAction(STRING_BUTTON_ACTION, linkAction); + getActionProvider().putAction(ExtendedFieldEditor.LABEL_SELECTED, linkAction); } } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultValueAdapter.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -13,18 +13,29 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.Properties; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.widgets.Shell; import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.actions.IActionProvider; import org.jboss.tools.common.model.ui.attribute.IValueFilter; +import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor; import org.jboss.tools.common.model.util.ModelFeatureFactory; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.XAttributeData; +import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintProperties; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; @@ -188,6 +199,9 @@ return valueFilter; } } + if (adapter == IActionProvider.class) { + return getActionProvider(); + } return null; } @@ -267,4 +281,76 @@ } return XMarkerManager.getInstance().getError(modelObject, attribute.getName()); } + + protected XActionWrapper labelAction; + protected IActionProvider actionProvider; + + protected IActionProvider getActionProvider() { + if(actionProvider == null) { + String actionPath = null; + if(attribute != null) { + if(attribute.getConstraint() instanceof XAttributeConstraintProperties) { + actionPath = ((XAttributeConstraintProperties)attribute.getConstraint()).getProperties().getProperty(DefaultTreeSelectionAdapter.LINK_ACTION); + } else { + actionPath = attribute.getProperty(DefaultTreeSelectionAdapter.LINK_ACTION); + } + } + if(actionPath != null) { + actionProvider = new ActionProvider(); + XAction xaction = XActionInvoker.getAction(actionPath, modelObject); + labelAction = (xaction != null) ? new XActionWrapper(xaction) : null; + if(labelAction != null) { + labelAction.setXModelObject(getModelObject()); + } + } + } + + return actionProvider; + } + + protected class XActionWrapper extends Action { + private XAction xaction = null; + + public XActionWrapper(XAction xaction) { + this.xaction = xaction; + } + + public void setXModelObject(XModelObject xmo) { + if (xmo != null && xaction != null) { +// this.setEnabled(xaction.isEnabled(xmo)); + this.setEnabled(true); + } else { + this.setEnabled(false); + } + } + + public void run() { + if (xaction != null) { + if(xaction.isEnabled(getModelObject())) { + XActionInvoker.invoke(xaction.getPath(), modelObject, new Properties()); + } else { + Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); + MessageDialog.openWarning(shell, "Warning", "Resource does not exist."); + } + } + } + } + + protected class ActionProvider implements IActionProvider { + + public ActionProvider() {} + + public IAction getAction(String actionName) { + if (ExtendedFieldEditor.LABEL_SELECTED.equals(actionName)) { + return labelAction; + } + return null; + } + + public IAction[] getActions() { + return new IAction[] {labelAction}; + } + public void update(ISelection selection) {} + } + } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -20,11 +20,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.bindings.keys.KeyStroke; -import org.eclipse.jface.bindings.keys.ParseException; import org.eclipse.jface.fieldassist.ComboContentAdapter; import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.SimpleContentProposalProvider; -import org.eclipse.jface.fieldassist.TextContentAdapter; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; @@ -49,11 +47,13 @@ import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; +import org.jboss.tools.common.model.ui.actions.IActionProvider; import org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory; import org.jboss.tools.common.model.ui.attribute.IListContentProvider; import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter; import org.jboss.tools.common.model.ui.widgets.BorderedControl; import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; +import org.jboss.tools.common.model.ui.widgets.WhiteSettings; import org.jboss.tools.common.model.ui.widgets.border.Border; public class ComboBoxFieldEditor extends ExtendedFieldEditor implements IFieldEditor, IPropertyFieldEditor, IPropertyChangeListener, PropertyChangeListener { @@ -393,6 +393,14 @@ labelProvider = (ILabelProvider)propertyEditor.getAdapter(ILabelProvider.class); listContentProvider = (IListContentProvider)propertyEditor.getAdapter(IListContentProvider.class); setErrorProvider((IAttributeErrorProvider)propertyEditor.getAdapter(IAttributeErrorProvider.class)); + IActionProvider actionProvider = (IActionProvider)propertyEditor.getAdapter(IActionProvider.class); + if (actionProvider != null) { + if (getSettings() instanceof WhiteSettings) { + setLabelAction(actionProvider.getAction(StringButtonFieldEditorEx.LABEL_SELECTED)); + } else { + // none + } + } } setPropertyChangeListener(this); valueProvider.addValueChangeListener(this); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -15,13 +15,18 @@ import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.navigator.LabelDecoratorImpl; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontMetrics; import org.eclipse.swt.graphics.GC; @@ -37,15 +42,21 @@ import org.jboss.tools.common.model.ui.widgets.DefaultSettings; import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; import org.jboss.tools.common.model.ui.widgets.WhiteSettings; +import org.jboss.tools.common.model.ui.widgets.xpl.SelectableFormLabel; public abstract class ExtendedFieldEditor extends org.eclipse.jface.preference.FieldEditor { + public final static String LABEL_SELECTED = "Label.Selected"; //$NON-NLS-1$ public static final String IS_VALID = "field_editor_is_valid";//$NON-NLS-1$ public static final String VALUE = "field_editor_value";//$NON-NLS-1$ protected static final int HORIZONTAL_GAP = 8; private IPreferenceStore preferenceStore = null; private boolean isDefaultPresented = false; + private Label label; + private IAction labelAction; + private boolean selectableLabel; + private boolean enabled = Boolean.TRUE.booleanValue(); private IAttributeErrorProvider errorProvider; @@ -150,17 +161,114 @@ } protected Label createLabelControl(Composite parent) { + if (label == null) { // cannot comment this! for details see label.addDisposeListener + int style; + Color fg; + Color activeColor; + Color disabled; + Font font; + Cursor cursor; + if (getLabelAction()!=null) { + style = getSettings().getStyle("Hyperlink.Style"); //$NON-NLS-1$ + fg = getSettings().getColor("Hyperlink.Foreground"); //$NON-NLS-1$ + disabled = getSettings().getColor("Hyperlink.Disabled"); //$NON-NLS-1$ + activeColor = getSettings().getColor("Hyperlink.ActiveColor"); //$NON-NLS-1$ + font = getSettings().getFont("Hyperlink.Font"); //$NON-NLS-1$ + cursor = getSettings().getCursor("Hyperlink.ActiveCursor"); //$NON-NLS-1$ + + if (style==SWT.DEFAULT) style = SWT.NONE; + SelectableFormLabel selectableLabel = new SelectableFormLabel(parent, style); + + selectableLabel.setFont(font); + selectableLabel.setActiveCursor(cursor); + selectableLabel.setPassiveColor(fg); + selectableLabel.setActiveColor(activeColor); + selectableLabel.setActiveCursor(cursor); + selectableLabel.setDisabledColor(disabled); + boolean enabled = getLabelAction().isEnabled() && isEnabled(); + selectableLabel.setEnabled(enabled); + selectableLabel.setToolTipText(enabled ? getHyperlinkLableToolTip() : null); + + label = selectableLabel; + + selectableLabel.addSelectionListener(new SelectionListener(){ + public void widgetSelected(SelectionEvent e) { + if (labelAction!=null) labelAction.run(); + } + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + getLabelAction().addPropertyChangeListener(new IPropertyChangeListener() { + public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) { + if (IAction.ENABLED.equals(event.getProperty())) { + boolean enabled = getLabelAction().isEnabled(); + ((SelectableFormLabel)label).setEnabled(enabled); + label.setToolTipText(enabled ? getHyperlinkLableToolTip() : null); + ((SelectableFormLabel)label).redraw(); + } + } + }); + // by default +// getLabelAction().setEnabled(Boolean.FALSE.booleanValue()); + } else { + style = getSettings().getStyle("Label.Style"); //$NON-NLS-1$ + if (style==SWT.DEFAULT) style = SWT.NONE; + fg = getSettings().getColor("Label.Foreground"); //$NON-NLS-1$ + font = getSettings().getFont("Label.Font"); //$NON-NLS-1$ + label = new Label(parent, style); + + label.setFont(font); + label.setForeground(fg); + label.setEnabled(isEnabled()); + } + String text = getLabelText(); + if (text != null) + label.setText(text); + label.addDisposeListener(new DisposeListener() { + public void widgetDisposed(DisposeEvent event) { + label = null; + } + }); + if(settings instanceof WhiteSettings) { + label.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); + } + } else { + checkParent(label, parent); + } + return label; + } + + public IAction getLabelAction() { + return labelAction; + } + + public void setLabelAction(IAction action) { + labelAction = action; + setSelectableLabel(labelAction != null); + } + + protected String getHyperlinkLableToolTip() { + return null; + } + + public boolean isSelectableLabel() { + return selectableLabel; + } + + public void setSelectableLabel(boolean b) { + selectableLabel = b; + } + + /* + protected Label createLabelControl(Composite parent) { if (getLabelControl() == null) { // cannot comment this! for details see label.addDisposeListener int style = getSettings().getStyle("Label.Style"); //$NON-NLS-1$ -/// Color bg = parent.getBackground(); - ///getSettings().getColor("Label.Background"); Color fg = getSettings().getColor("Label.Foreground"); //$NON-NLS-1$ Font font = getSettings().getFont("Label.Font"); //$NON-NLS-1$ if (style==SWT.DEFAULT) style = SWT.NONE; style |= SWT.RIGHT; label = new Label(parent, style); label.setFont(font); -/// label.setBackground(bg); label.setForeground(fg); if(settings instanceof WhiteSettings) { label.setForeground(getForeground()); @@ -181,6 +289,7 @@ } return label; } + */ public IPreferenceStore getPreferenceStore() { return preferenceStore; @@ -251,8 +360,7 @@ } } - protected void setButtonLayoutData(Button button) { - + protected void setButtonLayoutData(Button button) { GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); // Compute and store a font metric @@ -273,8 +381,12 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; - if ((this.label!=null)&&(!this.label.isDisposed())) { - label.setEnabled(this.enabled); + if (label != null && !label.isDisposed()) { + if (getLabelAction()!=null) { + label.setEnabled(getLabelAction().isEnabled() && enabled); + } else { + label.setEnabled(enabled); + } } } @@ -283,7 +395,9 @@ } public IWidgetSettings getSettings() { - if (this.settings==null) settings = DefaultSettings.getDefault(); + if (settings == null) { + settings = DefaultSettings.getDefault(); + } return settings; } @@ -322,6 +436,4 @@ updateErrorState(); } } - } - Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -17,22 +17,13 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IBuffer; -import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.core.search.SearchEngine; -import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog; -import org.eclipse.jdt.internal.ui.dialogs.OpenTypeSelectionDialog; -import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.JFaceResources; @@ -43,10 +34,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; -import org.eclipse.ui.menus.IWorkbenchWidget; import org.jboss.tools.common.meta.XAttribute; -import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -55,14 +43,12 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter; import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter; -import org.jboss.tools.common.model.ui.templates.ControlContentAssistHelper; import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; import org.jboss.tools.common.model.ui.wizards.INewClassWizard; import org.jboss.tools.common.model.ui.wizards.INewClassWizardFactory; import org.jboss.tools.common.model.ui.wizards.NewClassWizard; import org.jboss.tools.common.model.ui.wizards.NewTypeWizardAdapter; import org.jboss.tools.common.model.util.AccessibleJava; -import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; import org.jboss.tools.common.model.util.XModelObjectUtil; @@ -126,7 +112,6 @@ valueChangeListener = (IValueChangeListener)propertyEditor.getAdapter(IValueChangeListener.class); if(project != null) { setLabelAction(new OpenJavaEditorAction()); - setSelectableLabel(Boolean.TRUE.booleanValue()); setChangeButtonText(JFaceResources.getString("openBrowse")); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringButtonFieldEditorEx.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringButtonFieldEditorEx.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringButtonFieldEditorEx.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -19,24 +19,14 @@ import org.jboss.tools.common.model.ui.IValueProvider; import org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory; import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter; -import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Cursor; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; @@ -46,21 +36,15 @@ import org.jboss.tools.common.model.ui.actions.IActionProvider; import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; import org.jboss.tools.common.model.ui.widgets.WhiteSettings; -import org.jboss.tools.common.model.ui.widgets.xpl.SelectableFormLabel; public class StringButtonFieldEditorEx extends StringButtonFieldEditor implements IFieldEditor, IPropertyChangeListener, PropertyChangeListener, IPropertyFieldEditor { - public final static String LABEL_SELECTED = "Label.Selected"; //$NON-NLS-1$ public final static String BUTTON_SELECTED = "Button.Selected"; //$NON-NLS-1$ protected PropertyEditorDialog editorDialog; protected IPropertyEditor propertyEditor; protected IValueProvider valueProvider; protected IValueChangeListener valueChangeListener; protected Composite composite; - private Label label; - private boolean selectableLabel; private PropertyChangeSupport pcs = new PropertyChangeSupport(this); - private IActionProvider actionProvider; - private IAction labelAction; // private IAction buttonAction; public StringButtonFieldEditorEx() { @@ -72,99 +56,6 @@ this.setChangeButtonText(EditorMessages.getString("StringButtonFieldEditorEx_Browse")); //$NON-NLS-1$ } - public Label getLabelControl() { - return label; - } - - protected String getHyperlinkLableToolTip() { - return null; - } - - protected Label createLabelControl(Composite parent) { - if (label == null) { // cannot comment this! for details see label.addDisposeListener - int style; -/// Color bg; - Color fg; - Color activeColor; - Color disabled; - Font font; - Cursor cursor; - if (getLabelAction()!=null) { - style = getSettings().getStyle("Hyperlink.Style"); //$NON-NLS-1$ -/// bg = parent.getBackground(); - ///getSettings().getColor("Hyperlink.Background"); - fg = getSettings().getColor("Hyperlink.Foreground"); //$NON-NLS-1$ - disabled = getSettings().getColor("Hyperlink.Disabled"); //$NON-NLS-1$ - activeColor = getSettings().getColor("Hyperlink.ActiveColor"); //$NON-NLS-1$ - font = getSettings().getFont("Hyperlink.Font"); //$NON-NLS-1$ - cursor = getSettings().getCursor("Hyperlink.ActiveCursor"); //$NON-NLS-1$ - - if (style==SWT.DEFAULT) style = SWT.NONE; - SelectableFormLabel selectableLabel = new SelectableFormLabel(parent, style); - - selectableLabel.setFont(font); -/// selectableLabel.setBackground(bg); - selectableLabel.setActiveCursor(cursor); - selectableLabel.setPassiveColor(fg); - selectableLabel.setActiveColor(activeColor); - selectableLabel.setActiveCursor(cursor); - selectableLabel.setDisabledColor(disabled); - boolean enabled = getLabelAction().isEnabled() && isEnabled(); - selectableLabel.setEnabled(enabled); - selectableLabel.setToolTipText(enabled ? getHyperlinkLableToolTip() : null); - - label = selectableLabel; - - selectableLabel.addSelectionListener(new SelectionListener(){ - public void widgetSelected(SelectionEvent e) { - if (labelAction!=null) labelAction.run(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - getLabelAction().addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (IAction.ENABLED.equals(event.getProperty())) { - boolean enabled = getLabelAction().isEnabled(); - ((SelectableFormLabel)label).setEnabled(enabled); - label.setToolTipText(enabled ? getHyperlinkLableToolTip() : null); - ((SelectableFormLabel)label).redraw(); - } - } - }); - // by default -// getLabelAction().setEnabled(Boolean.FALSE.booleanValue()); - } else { - style = getSettings().getStyle("Label.Style"); //$NON-NLS-1$ - if (style==SWT.DEFAULT) style = SWT.NONE; -/// bg = parent.getBackground(); - ///getSettings().getColor("Label.Background"); - fg = getSettings().getColor("Label.Foreground"); //$NON-NLS-1$ - font = getSettings().getFont("Label.Font"); //$NON-NLS-1$ - label = new Label(parent, style); - - label.setFont(font); -/// label.setBackground(bg); - label.setForeground(fg); - label.setEnabled(isEnabled()); - } - String text = getLabelText(); - if (text != null) - label.setText(text); - label.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent event) { - label = null; - } - }); - if(settings instanceof WhiteSettings) { - label.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); - } - } else { - checkParent(label, parent); - } - return label; - } - public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); } @@ -174,7 +65,6 @@ public void firePropertyChange(java.beans.PropertyChangeEvent event) { pcs.firePropertyChange(event); } - public void setPropertyEditor(IPropertyEditor propertyEditor) { this.propertyEditor = propertyEditor; @@ -182,15 +72,14 @@ valueChangeListener = (IValueChangeListener)propertyEditor.getAdapter(IValueChangeListener.class); setPropertyChangeListener(this); valueProvider.addValueChangeListener(this); - actionProvider = (IActionProvider)propertyEditor.getAdapter(IActionProvider.class); + IActionProvider actionProvider = (IActionProvider)propertyEditor.getAdapter(IActionProvider.class); setErrorProvider((IAttributeErrorProvider)propertyEditor.getAdapter(IAttributeErrorProvider.class)); - if (actionProvider!=null) { + if (actionProvider != null) { if (getSettings() instanceof WhiteSettings) { - labelAction = actionProvider.getAction(StringButtonFieldEditorEx.LABEL_SELECTED); + setLabelAction(actionProvider.getAction(StringButtonFieldEditorEx.LABEL_SELECTED)); } else { // none } - if (labelAction!=null) this.selectableLabel = Boolean.TRUE.booleanValue(); // buttonAction = actionProvider.getAction(StringButtonFieldEditorEx.BUTTON_SELECTED); } } @@ -200,7 +89,7 @@ } protected String changePressed() { - if (propertyEditor!=null) { + if (propertyEditor != null) { if(propertyEditor.getInput() instanceof DefaultValueAdapter) { ((DefaultValueAdapter)propertyEditor.getInput()).fireEvent(BUTTON_SELECTED, "false", "true"); } @@ -304,9 +193,9 @@ protected void valueChanged() { super.valueChanged(); - if(isSelectableLabel() && label != null && !label.isDisposed()) { + if(isSelectableLabel() && getLabelControl() != null && !getLabelControl().isDisposed()) { boolean enabled = getLabelAction() != null && getLabelAction().isEnabled(); - label.setToolTipText(enabled ? getHyperlinkLableToolTip() : null); + getLabelControl().setToolTipText(enabled ? getHyperlinkLableToolTip() : null); } } @@ -343,31 +232,8 @@ return new Control[] {getLabelComposite(parent), getTextChangeControl(parent)}; } - public boolean isSelectableLabel() { - return selectableLabel; - } - - public void setSelectableLabel(boolean b) { - selectableLabel = b; - } - - public IAction getLabelAction() { - return labelAction; - } - - public void setLabelAction(IAction action) { - labelAction = action; - } - public void setEnabled(boolean enabled){ super.setEnabled(enabled); // label - if (getLabelComposite()!=null) { - if (getLabelAction()!=null) { - getLabelControl().setEnabled(getLabelAction().isEnabled() && enabled); - } else { - getLabelControl().setEnabled(enabled); - } - } } protected boolean isAlwaysReadOnly() { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2011-12-30 19:55:40 UTC (rev 37598) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2011-12-30 20:21:49 UTC (rev 37599) @@ -11,7 +11,7 @@ package org.jboss.tools.common.model.ui.attribute.editor; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener;

12 years, 4 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-12-30 14:55:40 -0500 (Fri, 30 Dec 2011) New Revision: 37598 Added: trunk/common/plugins/org.jboss.tools.common.ui/icons/add_annotation.png Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java Log: Better icon for CDI Tools https://issues.jboss.org/browse/JBIDE-10575 Added: trunk/common/plugins/org.jboss.tools.common.ui/icons/add_annotation.png =================================================================== (Binary files differ) Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/icons/add_annotation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-30 19:30:21 UTC (rev 37597) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-30 19:55:40 UTC (rev 37598) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.common.ui.marker; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Set; import org.eclipse.core.resources.IFile; @@ -33,9 +35,9 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.refactoring.CompilationUnitChange; import org.eclipse.jdt.internal.core.JavaElement; -import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.jdt.internal.ui.JavaPluginImages; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; @@ -233,7 +235,20 @@ @Override public Image getImage() { - return JavaPlugin.getImageDescriptorRegistry().get(JavaPluginImages.DESC_OBJS_ANNOTATION); + String key = "ADD_ANNOTATION"; + ImageRegistry registry = CommonUIPlugin.getDefault().getImageRegistry(); + Image image = registry.get(key); + if (image == null) { + try { + image = ImageDescriptor.createFromURL( + new URL(CommonUIPlugin.getDefault().getBundle() + .getEntry("/"), "icons/add_annotation.png")).createImage(); + registry.put(key, image); + } catch (MalformedURLException e) { + CommonUIPlugin.getDefault().logError(e); + } + } + return image; } private CompilationUnitChange updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37597 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-12-30 14:30:21 -0500 (Fri, 30 Dec 2011) New Revision: 37597 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java Log: https://issues.jboss.org/browse/JBIDE-10569 Weird tool tip for attribute Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2011-12-30 19:28:57 UTC (rev 37596) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2011-12-30 19:30:21 UTC (rev 37597) @@ -126,4 +126,9 @@ return annotation instanceof SimpleMarkerAnnotation; } } -} + + @Override + public String toString() { + return null; + } +} \ No newline at end of file

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37596 - in trunk/cdi/plugins: org.jboss.tools.cdi.xml/images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-12-30 14:28:57 -0500 (Fri, 30 Dec 2011) New Revision: 37596 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/bean_class.png Log: Better icon for CDI Tools https://issues.jboss.org/browse/JBIDE-10575 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png =================================================================== (Binary files differ) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png =================================================================== (Binary files differ) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/bean_class.png =================================================================== (Binary files differ)

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37595 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-12-30 13:42:24 -0500 (Fri, 30 Dec 2011) New Revision: 37595 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java Log: added test project removal operation to avoid unattended project in test workspace Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java 2011-12-30 17:37:03 UTC (rev 37594) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java 2011-12-30 18:42:24 UTC (rev 37595) @@ -12,41 +12,48 @@ import org.jboss.tools.jsf.ui.operation.JSFProjectCreationOperation; import org.jboss.tools.jsf.web.helpers.context.NewProjectWizardContext; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.WorkbenchUtils; import junit.framework.TestCase; public class NewJSFProjectTest extends TestCase { + static String PROJECT_NAME = "NewTestProject"; public void testNewJSFProjectOperation() throws Exception { - NewProjectWizardContext context = new NewProjectWizardContext(); - IProject project = getProjectHandle(); - context.setProject(project); - IPath defaultPath = ModelUIPlugin.getWorkspace().getRoot().getLocation(); - IPath locationPath = defaultPath.append(PROJECT_NAME); - context.setServletVersion("2.5"); - context.setProjectLocation(locationPath.toOSString()); - context.setProjectTemplate("JSFKickStartWithoutLibs"); - context.setJSFVersion("JSF 1.2"); - - JSFProjectCreationOperation operation = new JSFProjectCreationOperation(context); - IWorkbenchWindow window = JsfUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow(); - window.run(false, false, operation); - - IModelNature nature = EclipseResourceUtil.getModelNature(project); - assertNotNull(nature); - XModelObject webxml = nature.getModel().getByPath("/web.xml"); - assertNotNull(webxml); - - XModelObject[] s = WebAppHelper.getServlets(webxml); - assertTrue(s.length > 0); - String servletName = s[0].getAttributeValue("servlet-name"); - assertEquals("Faces Servlet", servletName); - - XModelObject facesConfig = nature.getModel().getByPath("/faces-config.xml"); - assertNotNull(facesConfig); - XModelObject userBean = facesConfig.getChildByPath("Managed Beans/user"); - assertNotNull(userBean); + try { + NewProjectWizardContext context = new NewProjectWizardContext(); + IProject project = getProjectHandle(); + context.setProject(project); + IPath defaultPath = ModelUIPlugin.getWorkspace().getRoot().getLocation(); + IPath locationPath = defaultPath.append(PROJECT_NAME); + context.setServletVersion("2.5"); + context.setProjectLocation(locationPath.toOSString()); + context.setProjectTemplate("JSFKickStartWithoutLibs"); + context.setJSFVersion("JSF 1.2"); + + JSFProjectCreationOperation operation = new JSFProjectCreationOperation(context); + IWorkbenchWindow window = JsfUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow(); + window.run(false, false, operation); + + IModelNature nature = EclipseResourceUtil.getModelNature(project); + assertNotNull(nature); + XModelObject webxml = nature.getModel().getByPath("/web.xml"); + assertNotNull(webxml); + + XModelObject[] s = WebAppHelper.getServlets(webxml); + assertTrue(s.length > 0); + String servletName = s[0].getAttributeValue("servlet-name"); + assertEquals("Faces Servlet", servletName); + + XModelObject facesConfig = nature.getModel().getByPath("/faces-config.xml"); + assertNotNull(facesConfig); + XModelObject userBean = facesConfig.getChildByPath("Managed Beans/user"); + assertNotNull(userBean); + } finally { + ResourcesUtils.deleteProject(PROJECT_NAME); + } } private IProject getProjectHandle() {

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37594 - trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-12-30 12:37:03 -0500 (Fri, 30 Dec 2011) New Revision: 37594 Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2KickStartWithoutLibs/ Log: moved test project which is used in jsf.test and jsf.ui.test plug-ins to jsf.base.test plug-in to break dependency between test plug-ins.

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r37593 - trunk/jsf/tests and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-12-30 12:34:22 -0500 (Fri, 30 Dec 2011) New Revision: 37593 Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/ Removed: jsf/tests/org.jboss.tools.jsf.base.test/ Log: moved jsf.base.test plug-in to right location in trunk

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2011