August 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r17190 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects: MissingKBBuilderTest and 16 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-08-20 10:42:42 -0400 (Thu, 20 Aug 2009) New Revision: 17190 Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.classpath trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.project trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/Person.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/resources.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/demo/Person.class trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/resources.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-api.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-ri.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-api.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-facelets.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-impl.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/index.jsp trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/greeting.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/inputname.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/common.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/.project trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-api.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-impl.jar Log: https://jira.jboss.org/jira/browse/JBIDE-4768 Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.classpath 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"> + <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/jre1.6.0_04"> + <attributes> + <attribute name="owner.project.facets" value="jst.java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.project 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>MissingKBBuilderTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/.jsdtscope 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,11 @@ +<?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> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.jdt.core.prefs 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,7 @@ +#Thu Aug 20 17:56:06 MSD 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.component 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="MissingKBBuilderTest"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="MissingKBBuilderTest"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="6.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/Person.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/Person.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/Person.java 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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 demo; + +/** + * Created by JBoss Tools + */ +public class Person { + private String name; + + public Person() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/demo/Person.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/resources.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/resources.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/resources.properties 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/JavaSource/resources.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/MANIFEST.MF 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/demo/Person.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/demo/Person.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/resources.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/resources.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/resources.properties 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/classes/resources.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/faces-config.xml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + <managed-bean> + <managed-bean-name>person</managed-bean-name> + <managed-bean-class>demo.Person</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputname.xhtml</from-view-id> + <navigation-case> + <from-outcome>greeting</from-outcome> + <to-view-id>/pages/greeting.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-ri.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/el-ri.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-facelets.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-facelets.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/web.xml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <description>Facelets StarterKit</description> + <display-name>MissingKBBuilderTest</display-name> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/index.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/index.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/index.jsp 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<html> +<head></head> + <body> + <jsp:forward page="pages/inputname.jsf" /> + </body> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/greeting.xhtml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <f:loadBundle basename="resources" var="msg" /> + <ui:composition template="/templates/common.xhtml"> + <ui:define name="pageTitle">Greeting to User</ui:define> + <ui:define name="pageHeader">Greeting Page</ui:define> + <ui:define name="body"> + #{msg.greeting} #{person.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/greeting.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/inputname.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/inputname.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/inputname.xhtml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + + <f:loadBundle basename="" var="msg" /> + + <ui:composition template="/templates/common.xhtml"> + + <ui:define name="pageTitle">Input User Name</ui:define> + + <ui:define name="pageHeader">Facelets Hello Application</ui:define> + + <ui:define name="body"> + <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" /> + <form jsfc="h:form" id="helloForm"> + ${msg.prompt} + <input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" /> + <input type="submit" jsfc="h:commandButton" id="submit" + action="greeting" value="Say Hello" /> + </form> + + </ui:define> + </ui:composition> +</html> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/pages/inputname.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/common.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/common.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/common.xhtml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,65 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <f:loadBundle basename="resources" var="msg" /> + <head> + <title><ui:insert name="pageTitle">Page Title</ui:insert></title> + <style type="text/css"> + body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 14px; + } + .header { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 18px; + } + .bottom { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 9px; + text-align: center; + vertical-align: middle; + color: #8E969D; + } + </style> + </head> + +<body bgcolor="#ffffff"> +<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400"> +<tbody> + + <tr> + <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB"> + <ui:insert name="pageHeader">Page Header</ui:insert> + </td> + </tr> + <tr> + <td height="1" width="100%" bgcolor="#CAD6E0"></td> + </tr> + + <tr> + <td width="100%" colspan="2"> + <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0"> + <tbody> + <tr> + <td align="center" width="100%" valign="middle"> + + <ui:insert name="body">Page Body</ui:insert> + + </td> + </tr> + </tbody> + </table> + </td> + </tr> + + <tr> + <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td> + </tr> +</tbody> +</table> +</body> + +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/WebContent/templates/common.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.properties 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,3 @@ +# +#Thu Aug 20 17:56:05 MSD 2009 +classpath.external= Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.xml 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,88 @@ +<project name="jsf12KickStart" basedir="../" default="deploy"> + + +  + <property name="deploy.dir" value="deploy"/> + + +  + <property name="project.distname" value="jsf12KickStart"/> + +  + <property file="${basedir}/ant/build.properties"/> + <property name="webroot.dir" value="${basedir}/WebContent"/> + <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/> + <property name="build.dir" value="build"/> + + +  + <path id="compile.classpath"> + <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/> + <pathelement path ="${webinf.dir}/lib/jstl.jar"/> + <pathelement path ="${webinf.dir}/lib/standard.jar"/> + <pathelement path ="${webinf.dir}/classes"/> + <pathelement path ="${classpath}"/> + </path> + +  + <target name="prepare"> + <tstamp/> + </target> + +  + <target name="resources"> + <copy todir="${webinf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.conf"/> + <include name="**/*.properties"/> + <include name="**/*.xml"/> + </patternset> + </fileset> + </copy> + </target> + +  + <target name="compile" depends="prepare,resources"> + <javac srcdir="JavaSource" destdir="${webinf.dir}/classes"> + <classpath refid="compile.classpath"/> + </javac> + </target> + +  + <target name="clean" + description="Prepare for clean build"> + <delete dir="${webinf.dir}/classes"/> + <mkdir dir="${webinf.dir}/classes"/> + </target> + +  + <target name="build" depends="prepare,compile"/> + <target name="rebuild" depends="clean,prepare,compile"/> + +  + <target name="war" depends="build"> + <mkdir dir="${build.dir}"/> + <war + basedir="${webroot.dir}" + warfile="${build.dir}/${project.distname}.war" + webxml="${webinf.dir}/web.xml"> + <exclude name="WEB-INF/${build.dir}/**"/> + <exclude name="WEB-INF/src/**"/> + <exclude name="WEB-INF/web.xml"/> + </war> + + </target> + + <target name="deploy" depends="war"> + <delete file="${deploy.dir}/${project.distname}.war"/> + <delete dir="${deploy.dir}/${project.distname}"/> + <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/> + </target> + +</project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/.project 2009-08-20 14:42:42 UTC (rev 17190) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>MissingKBBuilderTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/bin/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17189 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2009-08-20 10:41:53 -0400 (Thu, 20 Aug 2009) New Revision: 17189 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java Log: https://jira.jboss.org/jira/browse/JBIDE-4760 - Fixed Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-08-20 14:35:00 UTC (rev 17188) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-08-20 14:41:53 UTC (rev 17189) @@ -10,10 +10,10 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; +import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.Region; @@ -26,8 +26,8 @@ protected IFile resource; protected ELResolver[] elResolvers; - protected Map<Region, Set<Var>> vars = new HashMap<Region, Set<Var>>(); - protected Set<Var> allVars = new HashSet<Var>(); + protected Map<Region, List<Var>> vars = new HashMap<Region, List<Var>>(); + protected List<Var> allVars = new ArrayList<Var>(); /* * (non-Javadoc) @@ -65,7 +65,7 @@ * (non-Javadoc) */ public Var[] getVars(int offset) { - Set<Var> result = new HashSet<Var>(); + List<Var> result = new ArrayList<Var>(); for (Region region : vars.keySet()) { if(offset>=region.getOffset() && offset<=region.getOffset() + region.getLength()) { result.addAll(vars.get(region)); @@ -81,7 +81,7 @@ */ public void addVar(Region region, Var var) { if (this.vars.get(region) == null) { - this.vars.put(region, new HashSet<Var>()); + this.vars.put(region, new ArrayList<Var>()); } this.vars.get(region).add(var); allVars.add(var); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-20 14:35:00 UTC (rev 17188) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-20 14:41:53 UTC (rev 17189) @@ -242,12 +242,11 @@ l = l.getLeft(); } } + var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } ELOperandResolveStatus oldElStatus = resolveELOperand(file, operand, returnEqualedVariablesOnly, false); status.getProposals().addAll(oldElStatus.getProposals()); - - var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } if(!returnEqualedVariablesOnly && vars!=null) {

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17188 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test: src/org/jboss/tools/vpe/ui/test/dialog and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-08-20 10:35:00 -0400 (Thu, 20 Aug 2009) New Revision: 17188 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4547, simple junit for VpeResourcesDialog was added. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-08-20 13:44:33 UTC (rev 17187) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-08-20 14:35:00 UTC (rev 17188) @@ -30,3 +30,4 @@ Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.jboss.tools.vpe.resref.core Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-08-20 13:44:33 UTC (rev 17187) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-08-20 14:35:00 UTC (rev 17188) @@ -9,57 +9,40 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test.dialog; -//import java.util.Properties; - -//import org.eclipse.core.resources.IFile; -//import org.eclipse.swt.widgets.Shell; -//import org.jboss.tools.common.model.options.PreferenceModelUtilities; -//import org.jboss.tools.common.model.ui.ModelUIPlugin; -//import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryDialog; -//import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog; -//import org.jboss.tools.vpe.resref.VpeResourcesDialog; -//import org.jboss.tools.vpe.ui.test.TestUtil; +import org.eclipse.core.resources.IFile; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; +import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; -//import org.jboss.tools.vpe.ui.test.VpeUiTests; +import org.jboss.tools.vpe.ui.test.VpeUiTests; public class VpeResourcesDialogTest extends VpeTest { - - private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$ - - public VpeResourcesDialogTest(String name) { - super(name); - } -// public void _testVpeResourcesDialogOpen() throws Throwable { -// IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME, -// VpeUiTests.IMPORT_PROJECT_NAME); -// -// assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$ -// + "; projectName = " + VpeUiTests.IMPORT_PROJECT_NAME, file); //$NON-NLS-1$ -// -// VpeResourcesDialog dialog = new VpeResourcesDialog(); -// Properties p = new Properties(); -// p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$ -// p.put("file", file); //$NON-NLS-1$ -// p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$ -// dialog.setObject(p); -// Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); -// IQueryDialog dialogWindow = new AbstractQueryDialog(shell); -// -// dialogWindow.setView(dialog.getView()); -// dialogWindow.getDialog().create(); -// dialog.getView().setDialog(dialogWindow.getDialog()); -// dialogWindow.getDialog().setBlockOnOpen(false); -// dialogWindow.getDialog().open(); -// int code = dialogWindow.getDialog().getReturnCode(); -// -// /* -// * Assert that window has been created. -// */ -// assertEquals(0, code); -// -// dialogWindow.getDialog().close(); -// } - - + private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$ + + public VpeResourcesDialogTest(String name) { + super(name); + } + + public void testVpeResourcesDialogOpen() throws Throwable { + IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME, + VpeUiTests.IMPORT_PROJECT_NAME); + + assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$ + + "; projectName = " + VpeUiTests.IMPORT_PROJECT_NAME, file); //$NON-NLS-1$ + + VpeResourcesDialog dialog = new VpeResourcesDialog(PlatformUI + .getWorkbench().getDisplay().getActiveShell(), file); + + dialog.setBlockOnOpen(false); + int code = dialog.open(); + + /* + * Assert that window has been created. + */ + assertEquals(0, code); + + dialog.close(); + } + }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17187 - trunk/hibernatetools/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2009-08-20 09:44:33 -0400 (Thu, 20 Aug 2009) New Revision: 17187 Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml Log: https://jira.jboss.org/jira/browse/JBDS-685 Hibernate Configuration File opened in different ways Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml =================================================================== --- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-08-20 13:11:28 UTC (rev 17186) +++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-08-20 13:44:33 UTC (rev 17187) @@ -91,7 +91,7 @@ </emphasis> file if you do not already have such one.</para> <para>Start the wizard by clicking <emphasis> - <property>New > Other (Ctrl+N)</property> + <property>New > Other (Ctrl+N)</property> or on a web Seam project in Web Projects view <property> WebContent -> New -> File -> Hibernate Configuration 3.0</property> </emphasis>, then <emphasis> <property>Hibernate > Hibernate Configuration File (cfg.xml)</property> </emphasis> and press <emphasis>

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17186 - trunk/vpe/plugins/org.jboss.tools.vpe/resources.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-08-20 09:11:28 -0400 (Thu, 20 Aug 2009) New Revision: 17186 Removed: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/ Log: https://jira.jboss.org/jira/browse/JBIDE-4547, resuorces/meta folder in VPE plugin was deleted.

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17185 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-08-20 08:15:18 -0400 (Thu, 20 Aug 2009) New Revision: 17185 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4768 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-08-20 12:13:49 UTC (rev 17184) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-08-20 12:15:18 UTC (rev 17185) @@ -61,6 +61,7 @@ import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.messages.JstUIMessages; import org.jboss.tools.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.KbProjectFactory; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.KbQuery.Type; import org.jboss.tools.jst.web.kb.internal.KbBuilder; @@ -130,6 +131,7 @@ for (IMarker m : markers) { try { project.deleteMarkers(KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE); + project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null); } catch (CoreException ex) { JspEditorPlugin.getPluginLog().logError(ex); } @@ -168,7 +170,11 @@ args.add(kbBuilderIsAbsent ? JstUIMessages.KBBUILDER_NOT_FOUND : ""); //$NON-NLS-1$ String message = MessageFormat.format(JstUIMessages.KBPROBLEM, args.toArray()); - if (m == null) m = r.createMarker(KB_PROBLEM_MARKER_TYPE); + if (m == null) { + m = r.createMarker(KB_PROBLEM_MARKER_TYPE); + r.setPersistentProperty(KbProjectFactory.NATURE_MOCK, "true"); + KbProjectFactory.getKbProject(r.getProject(), true); + } m.setAttribute(IMarker.MESSAGE, message); m.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING); m.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_NORMAL);

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17184 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-08-20 08:13:49 -0400 (Thu, 20 Aug 2009) New Revision: 17184 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-4768 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java 2009-08-20 12:12:24 UTC (rev 17183) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java 2009-08-20 12:13:49 UTC (rev 17184) @@ -10,9 +10,20 @@ ******************************************************************************/ package org.jboss.tools.jst.web.kb; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.HashSet; + +import org.eclipse.core.internal.events.InternalBuilder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.model.XJob; +import org.jboss.tools.common.model.XJob.XRunnable; import org.jboss.tools.jst.web.WebModelPlugin; +import org.jboss.tools.jst.web.kb.internal.KbBuilder; +import org.jboss.tools.jst.web.kb.internal.KbProject; public class KbProjectFactory { @@ -30,11 +41,18 @@ public static IKbProject getKbProject(IProject project, boolean resolve) { if(project == null || !project.exists() || !project.isOpen()) return null; try { - if(!project.hasNature(IKbProject.NATURE_ID)) return null; + if(!project.hasNature(IKbProject.NATURE_ID)) { + String s = project.getPersistentProperty(NATURE_MOCK); + if(s != null && "true".equals(s)) { + return getMockKbProject(project); + } + return null; + } } catch (CoreException e) { //ignore - all checks are done above return null; } + mockProjectStore.remove(project); IKbProject kbProject; try { @@ -47,4 +65,61 @@ return null; } + public static QualifiedName NATURE_MOCK = new QualifiedName("", IKbProject.NATURE_ID + ".mock"); + + static HashMap<IProject, IKbProject> mockProjectStore = new HashMap<IProject, IKbProject>(); + static HashSet<IProject> underConstruction = new HashSet<IProject>(); + + static IKbProject getMockKbProject(final IProject project) { + IKbProject result = mockProjectStore.get(project); + if(result != null) { + return result; + } + if(underConstruction.contains(project)) { + return null; + } + underConstruction.add(project); + final KbProject mock = new KbProject(); + class KbBuilderEx extends KbBuilder { + protected KbProject getKbProject() { + return mock; + } + public void build() { + try { + build(INCREMENTAL_BUILD, null, new NullProgressMonitor()); + } catch (CoreException e) { + WebModelPlugin.getPluginLog().logError(e); + } + } + }; + XJob.addRunnable(new XRunnable(){ + public void run() { +// System.out.println("build begin"); + long t0 = System.currentTimeMillis(); + mock.setProject(project); + KbBuilderEx builder = new KbBuilderEx(); + setProjectToBuilder(builder, project); + builder.build(); + mockProjectStore.put(project, mock); + underConstruction.remove(project); +// long dt = System.currentTimeMillis() - t0; +// System.out.println("build end " + dt); + } + + public String getId() { + return "Creating Mock Kb Project"; + } + }); + return mock; + } + + static void setProjectToBuilder(KbBuilder builder, IProject project) { + try { + Method m = InternalBuilder.class.getDeclaredMethod("setProject", new Class[]{IProject.class}); + m.setAccessible(true); + m.invoke(builder, project); + } catch (Exception e) { + WebModelPlugin.getPluginLog().logError(e); + } + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-08-20 12:12:24 UTC (rev 17183) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-08-20 12:13:49 UTC (rev 17184) @@ -39,7 +39,7 @@ KbResourceVisitor resourceVisitor = null; - KbProject getKbProject() { + protected KbProject getKbProject() { IProject p = getProject(); if(p == null) return null; return (KbProject)KbProjectFactory.getKbProject(p, false); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-08-20 12:12:24 UTC (rev 17183) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-08-20 12:13:49 UTC (rev 17184) @@ -305,6 +305,11 @@ * @throws IOException */ public void store() throws IOException { + try { + if(!project.hasNature(IKbProject.NATURE_ID)) return; + } catch (CoreException e) { + //ignore + } File file = getStorageFile(); file.getParentFile().mkdirs(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java 2009-08-20 12:12:24 UTC (rev 17183) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java 2009-08-20 12:13:49 UTC (rev 17184) @@ -28,8 +28,7 @@ */ public static ITagLibrary[] getLibraries(IProject project, String uri) { IKbProject kbProject = KbProjectFactory.getKbProject(project, true); - if(kbProject==null) { - WebKbPlugin.getDefault().logWarning("Project " + project.getName() + " doesn't have KB nature."); //$NON-NLS-1$ //$NON-NLS-2$ + if(kbProject == null) { return new ITagLibrary[0]; } return kbProject.getTagLibraries(uri);

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17183 - in trunk: common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-08-20 08:12:24 -0400 (Thu, 20 Aug 2009) New Revision: 17183 Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4547, Add Global EL resource reference dialog was remade, vpe.meta was deleted, license notes were added to new classes, EL preference page was updated. Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2009-08-20 12:12:24 UTC (rev 17183) @@ -17,3 +17,4 @@ org.jboss.tools.common.model.ui;bundle-version="2.0.0" Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.jboss.tools.vpe.resref.core Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -13,12 +13,15 @@ import java.util.List; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.el.core.GlobalELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.common.resref.core.ResourceReferenceList; -import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; -import org.jboss.tools.common.resref.ui.BaseAddReferenceSupport; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; +import org.jboss.tools.vpe.resref.core.AbstractResourceReferencesComposite; +import org.jboss.tools.vpe.resref.core.GlobalELReferenceWizardDialog; +import org.jboss.tools.vpe.resref.core.ReferenceWizardDialog; /** @@ -29,14 +32,6 @@ public class GlobalElVariablesComposite extends AbstractResourceReferencesComposite { /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return ""; //$NON-NLS-1$ - } - - /** * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createTableProvider(java.util.List) */ @Override @@ -45,14 +40,6 @@ } /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getEntity() - */ - @Override - protected String getEntity() { - return "VPEGlobalElReference"; //$NON-NLS-1$ - } - - /** * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getReferenceList() */ @Override @@ -66,25 +53,41 @@ rf.setGlobal(true); return rf; } + + protected ReferenceWizardDialog getDialog(ResourceReference resref) { + return new GlobalELReferenceWizardDialog( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), fileLocation, resref, getReferenceArray()); + } @Override protected void add(int index) { - ResourceReference defaultRef = getDefaultResourceReference(); - - boolean ok = BaseAddReferenceSupport.add(file, defaultRef, getReferenceArray(), getEntity()); - if(!ok) return; - dataList.add(defaultRef); - update(); - table.setSelection(dataList.size() - 1); + ResourceReference resref = getDefaultResourceReference(); + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + dataList.add(resref); + update(); + table.setSelection(dataList.size() - 1); + } } @Override protected void edit(int index) { - if(index < 0) return; - ResourceReference defaultRef = getReferenceArray()[index]; - boolean ok = BaseAddReferenceSupport.edit(file, defaultRef, getReferenceArray(), getEntity()); - if(!ok) return; - update(); + if(index < 0) { + return; + } + ResourceReference resref = getReferenceArray()[index]; + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + update(); + } } } Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,483 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" "meta.dtd"> -<XModelEntityGroup> - <VERSION MODULE="VPE" VERSION="1.0"/> - <MAPPINGS/> - <ICONS/> - <GlobalActions kind="list"/> - <XModelEntity ImplementingClass="%Regular%" name="VPECSSReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FILES_ONLY"/> - <value name="extensions=css"/> - </Constraint> - <Editor name="FileChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceAddItem" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPECSSReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceEditItem" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPECSSReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPECSSReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FILES_ONLY"/> - <value name="extensions=css"/> - </Constraint> - <Editor name="FileChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceAddItem" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPECSSReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceEditItem" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPECSSReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - -  - <XModelEntity ImplementingClass="%Regular%" name="VPEElReference"> - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, - key=VPEElReferenceAddItem" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEElReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, - key=VPEElReferenceEditItem" - displayName="Edit El Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEElReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - - -  - <XModelEntity ImplementingClass="%Regular%" name="VPEGlobalElReference"> - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Global: For all projects in workspace"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, - key=VPEGlobalElReferenceAddItem" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEGlobalElReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, - key=VPEGlobalElReferenceEditItem" - displayName="Edit El Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEGlobalElReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - - - <XModelEntity ImplementingClass="%Regular%" name="VPEFolderReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page"/> - <value name="Folder"/> - <value name="Project"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"/> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEFolderReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page"/> - <value name="Folder"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"/> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEImageReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=images folder"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEImageReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEImageReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEImageReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=images folder"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEImageReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEImageReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPETLDReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport, key=VPETLDReferenceAddItem" - displayName="Add Taglib Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPETLDReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport, key=VPETLDReferenceEditItem" - displayName="Edit Taglib Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPETLDReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPETLDReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport, key=VPETLDReferenceAddItem" - displayName="Add TLD Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPETLDReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport, key=VPETLDReferenceEditItem" - displayName="Edit TLD Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPETLDReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> -</XModelEntityGroup> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -11,8 +11,6 @@ package org.jboss.tools.vpe.editor.preferences; -import java.util.Properties; - import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -23,7 +21,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.jboss.tools.common.el.ui.GlobalElVariablesComposite; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; /** * Page for the El preferences. @@ -34,7 +31,7 @@ public static final String ID = "org.jboss.tools.common.xstudio.elvariables"; //$NON-NLS-1$ /** The el. */ - private GlobalElVariablesComposite el = new GlobalElVariablesComposite(); + private GlobalElVariablesComposite el = new GlobalElVariablesComposite(); @Override protected void performApply() { @@ -67,8 +64,8 @@ layout.marginWidth = 0; layout.marginHeight = 0; c.setLayout(layout); - - setUpVariableComposite(el); + + el.setObject(Platform.getLocation()); data = new GridData(GridData.FILL_BOTH); final Control elControl = el.createControl(c); elControl.setLayoutData(data); @@ -84,25 +81,11 @@ @Override public boolean performOk() { boolean rst = super.performOk(); - el.commit(); return rst; } /** - * Sets the up variable composite. - * - * @param el the el - */ - private void setUpVariableComposite(GlobalElVariablesComposite el){ - final Properties p = new Properties(); - p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$ - p.put("path", Platform.getLocation()); //$NON-NLS-1$ - p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$ - el.setObject(p); - } - - /** * Init. * * @param workbench the workbench @@ -110,8 +93,9 @@ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ public void init(IWorkbench workbench) { - // TODO Auto-generated method stub - + /* + * Do nothing + */ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; public class CSSReferenceWizard extends ReferenceWizard { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.io.File; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.io.File; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.jboss.tools.common.resref.core.ResourceReference; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.util.HashMap; @@ -24,10 +34,6 @@ super(pageName, title, titleImage, fileLocation); } - public ELReferenceWizardPage(String pageName) { - super(pageName); - } - public void createControl(Composite parent) { Composite pageControl = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(2, false); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.util.Map; @@ -91,7 +101,7 @@ /* * When El name is not specified */ - errorMessage = "EL Name should be set."; + errorMessage = Messages.EL_NAME_SHOULD_BE_SET; pageComplete = false; } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.util.List; @@ -55,7 +65,6 @@ update(); table.setSelection(dataList.size() - 1); } - } Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; + +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalELReferenceWizard extends ELReferenceWizard { + + public GlobalELReferenceWizard(Object fileLocation, String windowTitle, + ResourceReference[] resrefList) { + super(fileLocation, windowTitle, resrefList); + } + + @Override + protected void createPage() { + page = new GlobalElReferenceWizardPage(Messages.GLOBAL_EL_WIZARD_PAGE_NAME, + Messages.VRD_ADD_EL_PREFERENCE, ReferenceWizardPage + .getImageDescriptor(), fileLocation); + page.setDescription(Messages.ADD_GLOBAL_EL_PREFERENCE_MESSAGE); + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; + +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalELReferenceWizardDialog extends ReferenceWizardDialog { + + public GlobalELReferenceWizardDialog(Shell parentShell, + Object fileLocation, ResourceReference resref, + ResourceReference[] resrefList) { + super(parentShell, new GlobalELReferenceWizard(fileLocation, + Messages.VRD_ADD_EL_PREFERENCE, resrefList), resref); + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Layout; +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalElReferenceWizardPage extends ELReferenceWizardPage { + + public GlobalElReferenceWizardPage(String pageName, String title, + ImageDescriptor titleImage, Object fileLocation) { + super(pageName, title, titleImage, fileLocation); + } + + @Override + protected Group createScopeGroup(Composite parent) { + Group groupControl = new Group(parent, SWT.SHADOW_ETCHED_IN); + groupControl.setText(Messages.SCOPE_GROUP_NAME); + Layout layout = new GridLayout(1, false); + groupControl.setLayout(layout); + + Button globalRadioButton = new Button(groupControl, SWT.RADIO); + globalRadioButton.setText(Messages.SCOPE_GLOBAL); + globalRadioButton.setSelection(true); + globalRadioButton.addSelectionListener(this); + + return groupControl; + } + + @Override + protected int getSelectedScope() { + return ResourceReference.GLOBAL_SCOPE; + } + + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,14 +1,13 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. +/******************************************************************************* + * Copyright (c) 2007-2009 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: - * Red Hat, Inc. - initial API and implementation + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.vpe.resref.core; import org.jboss.tools.common.resref.core.ResourceReference; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -49,6 +49,8 @@ public static String SCOPE_FOLDER_SHORT; public static String SCOPE_PROJECT; public static String SCOPE_PROJECT_SHORT; + public static String SCOPE_GLOBAL; + public static String SCOPE_GLOBAL_SHORT; public static String WIZARD_PAGE_SHOULD_BE_INITIALIZED; @@ -65,6 +67,7 @@ public static String VRD_ADD_TAGLIB_PREFERENCE_MESSAGE; public static String VRD_ADD_EL_PREFERENCE; public static String VRD_ADD_EL_PREFERENCE_MESSAGE; + public static String ADD_GLOBAL_EL_PREFERENCE_MESSAGE; public static String VRD_PAGE_DESIGN_OPTIONS_ABOUT; public static String VRD_ACTUAL_RUN_TIME_FOLDERS_ABOUT; @@ -89,9 +92,11 @@ public static String URI_SHOULD_BE_SET; + public static String GLOBAL_EL_WIZARD_PAGE_NAME; public static String EL_WIZARD_PAGE_NAME; public static String EL_NAME; public static String EL_VALUE; + public static String EL_NAME_SHOULD_BE_SET; public static String INVALID_EL_EXPRESSION; public static String CANNOT_PARSE_SCOPE_VALUE; public static String EL_EXPRESSION_ALREADY_EXISTS; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.eclipse.jface.wizard.Wizard; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.eclipse.jface.dialogs.Dialog; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -43,11 +43,6 @@ this.fileLocation = fileLocation; setPageComplete(false); } - - public ReferenceWizardPage(String pageName) { - super(pageName); - setPageComplete(false); - } public static ImageDescriptor getImageDescriptor() { Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; public class TaglibReferenceWizard extends ReferenceWizard { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.util.HashMap; @@ -10,7 +20,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; public class TaglibReferenceWizardPage extends ReferenceWizardPage { @@ -25,10 +34,6 @@ super(pageName, title, titleImage, fileLocation); } - public TaglibReferenceWizardPage(String pageName) { - super(pageName); - } - public void createControl(Composite parent) { Composite pageControl = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(2, false); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.net.URI; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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.vpe.resref.core; import java.io.IOException; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-20 12:12:24 UTC (rev 17183) @@ -11,9 +11,11 @@ SCOPE_PAGE=Page: Only This Page SCOPE_FOLDER=Folder: Any Page at the Same Folder SCOPE_PROJECT=Project: Any Page at the Same Project +SCOPE_GLOBAL=Global: For all projects in workspace SCOPE_PAGE_SHORT=Page SCOPE_FOLDER_SHORT=Folder SCOPE_PROJECT_SHORT=Project +SCOPE_GLOBAL_SHORT=Global WIZARD_PAGE_SHOULD_BE_INITIALIZED=Reference wizard page should be initialized. # Runtime folders @@ -45,10 +47,11 @@ # El expression folder tab and dialog VRD_SUBSTITUTED_EL_EXPRESSIONS=Substituted EL expressions VRD_INVALID_EL_EXPRESSION=Invalid EL Expression. - VRD_SUBSTITUTED_EL_EXPRESSIONS_ABOUT=These EL expressions will be substituted by Visual Page Editor when generating a preview VRD_ADD_EL_PREFERENCE=Add EL Reference VRD_ADD_EL_PREFERENCE_MESSAGE=Add El variable, which will be substituted in a visual part for generating a preview +ADD_GLOBAL_EL_PREFERENCE_MESSAGE=Add global El variable, which will be substituted in a visual part for generating a preview +GLOBAL_EL_WIZARD_PAGE_NAME=Global EL Page EL_WIZARD_PAGE_NAME=EL Page EL_NAME=El Name* EL_VALUE=Value @@ -60,6 +63,7 @@ URI_SHOULD_BE_SET=URI should be set. # EL Validation +EL_NAME_SHOULD_BE_SET=EL Name should be set. INVALID_EL_EXPRESSION=Invalid EL expression. CANNOT_PARSE_SCOPE_VALUE=Cannot parse scope value EL_EXPRESSION_ALREADY_EXISTS=EL expression already exists in the selected scope.

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17182 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: edimap/editor and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-08-20 05:51:23 -0400 (Thu, 20 Aug 2009) New Revision: 17182 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java Log: JBIDE-4648 Fix a bug of synchronizing EMF model and GEF model Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.edit.domain.EditingDomain; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; @@ -46,6 +47,8 @@ import org.jboss.tools.smooks.model.javabean.JavabeanPackage; import org.jboss.tools.smooks.model.javabean.ValueType; import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; import org.jboss.tools.smooks.model.smooks.DocumentRoot; @@ -86,40 +89,47 @@ */ @Override protected Diagnostic validateModel(Object model, EditingDomain editingDomain) { - EAttribute feature = getAttribute(model); - String path = getPath(model); - if (path == null) { - return null; - } - // if(feature != null && path == null){ - // return newWaringDiagnostic("Selector '" +path+ "' isn't available", - // model, feature); - // } - String sperator = "/"; - if (path.indexOf('/') == -1) { - sperator = " "; - } - if (feature != null && path != null) { - Object node = null; - for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { - Object obj = (Object) iterator.next(); - if (obj instanceof IXMLStructuredObject) { - if (node == null) { - try { - node = SmooksUIUtils - .localXMLNodeWithPath(path, (IXMLStructuredObject) obj, sperator, false); - } catch (Throwable e) { - SmooksConfigurationActivator.getDefault().log(e); + if (model instanceof EObject) { + EAttribute feature = getAttribute(model); + Object data = ((EObject)model).eGet(feature); + if(data == null){ + return null; + } + String path = data.toString(); +// if (path == null) { +// return null; +// } + // if(feature != null && path == null){ + // return newWaringDiagnostic("Selector '" +path+ + // "' isn't available", + // model, feature); + // } + String sperator = "/"; + if (path.indexOf('/') == -1) { + sperator = " "; + } + if (feature != null && path != null) { + Object node = null; + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + Object obj = (Object) iterator.next(); + if (obj instanceof IXMLStructuredObject) { + if (node == null) { + try { + node = SmooksUIUtils.localXMLNodeWithPath(path, (IXMLStructuredObject) obj, sperator, + false); + } catch (Throwable e) { + SmooksConfigurationActivator.getDefault().log(e); + } } + if (node != null) { + return null; + } } - if (node != null) { - return null; - } } + if (node == null) { + return newWaringDiagnostic("Selector '" + path + "' isn't available", model, feature); + } } - if (node == null) { - return newWaringDiagnostic("Selector '" + path + "' isn't available", model, feature); - } } return super.validateModel(model, editingDomain); } @@ -170,9 +180,27 @@ if (model instanceof ValueType) { return JavabeanPackage.Literals.VALUE_TYPE__DATA; } + + if(model instanceof BeanType){ + return Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT; + } + if (model instanceof org.jboss.tools.smooks.model.javabean12.WiringType) { + return Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; + } + if (model instanceof org.jboss.tools.smooks.model.javabean12.ExpressionType) { + return Javabean12Package.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT; + } + if (model instanceof org.jboss.tools.smooks.model.javabean12.ValueType) { + return Javabean12Package.Literals.VALUE_TYPE__DATA; + } return null; } + /** + * @deprecated + * @param model + * @return + */ private String getPath(Object model) { if (model instanceof ExpressionType) { return ((ExpressionType) model).getExecOnElement(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -1123,7 +1123,7 @@ if (data == model) { return treeNodeModel; } - AbstractSmooksGraphicalModel m = findEDIGraphicalModel(model, treeNodeModel.getChildren()); + AbstractSmooksGraphicalModel m = findEDIGraphicalModel(model, treeNodeModel.getChildrenWithoutDynamic()); if (m != null) { return m; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -93,6 +93,13 @@ } return children; } + + public List<AbstractSmooksGraphicalModel> getChildrenWithoutDynamic() { + if (children == null) { + children = new ArrayList<AbstractSmooksGraphicalModel>(); + } + return children; + } public static void disconnectAllConnections(AbstractSmooksGraphicalModel node) { List<TreeNodeConnection> sourceConnections = node.getSourceConnections(); @@ -180,16 +187,16 @@ } public void addChild(AbstractSmooksGraphicalModel node) { - if (getChildren().indexOf(node) == -1) { - getChildren().add(node); + if (getChildrenWithoutDynamic().indexOf(node) == -1) { + getChildrenWithoutDynamic().add(node); node.setParent(this); support.firePropertyChange(PRO_ADD_CHILD, null, node); } } public void removeChild(AbstractSmooksGraphicalModel node) { - if (getChildren().indexOf(node) != -1) { - getChildren().remove(node); + if (getChildrenWithoutDynamic().indexOf(node) != -1) { + getChildrenWithoutDynamic().remove(node); node.setParent(null); support.firePropertyChange(PRO_REMOVE_CHILD, node, null); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.swt.graphics.Image; @@ -73,6 +74,7 @@ if (models != null) { for (int i = 0; i < models.length; i++) { Object model = models[i]; +// model = AdapterFactoryEditingDomain.unwrap(model); if (!childExsit(model)) { TreeNodeModel n = createChildModel(model, contentProvider, labelProvider); children.add(n); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactory.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.graphical.editors; + +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.jboss.tools.smooks.gef.common.RootModel; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; + +/** + * @author Dart + * + */ +public interface ConnectionModelFactory { + + public boolean hasBeanIDReferenceConnection(AbstractSmooksGraphicalModel model); + + public TreeNodeConnection createBeanIDReferenceConnection(EObject rootModel, RootModel root, + AbstractSmooksGraphicalModel model); + + public List<TreeNodeConnection> createSelectorConnection(List<Object> inputDataList, RootModel root, + AbstractSmooksGraphicalModel model); + + public boolean hasSelectorConnection(AbstractSmooksGraphicalModel model); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactoryImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactoryImpl.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.graphical.editors; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; +import org.jboss.tools.smooks.gef.common.RootModel; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; +import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil; + +/** + * @author Dart + * + */ +public class ConnectionModelFactoryImpl implements ConnectionModelFactory { + + public TreeNodeConnection createBeanIDReferenceConnection(EObject rootModel , RootModel root, + AbstractSmooksGraphicalModel model) { + return null; + } + + public boolean hasBeanIDReferenceConnection(AbstractSmooksGraphicalModel model) { + return false; + } + + public boolean hasSelectorConnection(AbstractSmooksGraphicalModel model) { + Object data = model.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + if (data instanceof EObject) { + return (SmooksGraphUtil.getSelectorFeature((EObject) data) != null); + } + return false; + } + + public List<TreeNodeConnection> createSelectorConnection(List<Object> inputDataList, RootModel root, + AbstractSmooksGraphicalModel model) { + Object data = model.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + List<TreeNodeConnection> connections = new ArrayList<TreeNodeConnection>(); + if (data != null && data instanceof EObject) { + EStructuralFeature feature = SmooksGraphUtil.getSelectorFeature((EObject) data); + Object sd = ((EObject) data).eGet(feature); + if (sd != null) { + String selector = sd.toString(); + if (inputDataList != null) { + for (Iterator<?> iterator = inputDataList.iterator(); iterator.hasNext();) { + Object obj = (Object) iterator.next(); + if (obj instanceof IXMLStructuredObject) { + AbstractSmooksGraphicalModel sourceGraphModel = SmooksGraphUtil.findInputGraphModel( + selector, (IXMLStructuredObject) obj, root); + if (sourceGraphModel != null) { + boolean canCreate = true; + List<TreeNodeConnection> tcs = model.getTargetConnections(); + for (Iterator<?> iterator2 = tcs.iterator(); iterator2.hasNext();) { + TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); + if (treeNodeConnection.getSourceNode() == sourceGraphModel) { + canCreate = false; + } + } + if (!canCreate) { + break; + } + TreeNodeConnection connection = new TreeNodeConnection(sourceGraphModel, model); + sourceGraphModel.getSourceConnections().add(connection); + sourceGraphModel.fireConnectionChanged(); + model.getTargetConnections().add(connection); + model.fireConnectionChanged(); + connections.add(connection); + } + } + } + } + } + } + return connections; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/ConnectionModelFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactory.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.graphical.editors; + +import org.jboss.tools.smooks.editor.ISmooksModelProvider; + +/** + * @author Dart + * + */ +public interface GraphicalModelFactory { + public Object createGraphicalModel(Object model, ISmooksModelProvider provider); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.graphical.editors; + +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; +import org.jboss.tools.smooks.model.common.AbstractAnyType; +import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.javabean12.BeanType; + +/** + * @author Dart + * + */ +public class GraphicalModelFactoryImpl implements GraphicalModelFactory{ + public Object createGraphicalModel(Object model, ISmooksModelProvider provider) { + AbstractSmooksGraphicalModel graphModel = null; + if (model instanceof BindingsType || model instanceof BeanType) { + AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider + .getEditingDomain(); + ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain.getAdapterFactory()); + ILabelProvider labelProvider = new AdapterFactoryLabelProvider(editingDomain.getAdapterFactory()) { + @Override + public String getText(Object object) { + Object obj = AdapterFactoryEditingDomain.unwrap(object); + if (obj instanceof AbstractAnyType) { + return super.getText(obj); + } + return super.getText(object); + } + + }; + graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, provider); + ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); + } + return graphModel; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -26,8 +26,6 @@ import org.eclipse.emf.edit.command.DeleteCommand; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.EditPart; import org.eclipse.gef.commands.CommandStackEvent; @@ -71,11 +69,9 @@ import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel; import org.jboss.tools.smooks.graphical.editors.model.JavaBeanChildGraphModel; import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; -import org.jboss.tools.smooks.model.common.AbstractAnyType; import org.jboss.tools.smooks.model.graphics.ext.FigureType; import org.jboss.tools.smooks.model.graphics.ext.GraphType; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; -import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; @@ -84,8 +80,15 @@ * @author Dart * */ -public class SmooksGraphicalEditorPart extends GraphicalEditor implements ISelectionChangedListener ,ISourceSynchronizeListener { +public class SmooksGraphicalEditorPart extends GraphicalEditor implements ISelectionChangedListener, + ISourceSynchronizeListener { + public static final int EXECUTE_COMMAND = 0; + + public static final int REDO_COMMAND = 1; + + public static final int UNDO_COMMAND = 2; + private DefaultEditDomain editDomain = null; private ISmooksModelProvider smooksModelProvider = null; @@ -96,6 +99,10 @@ private List<Object> inputDataList = null; + private GraphicalModelFactory graphicalModelFactory; + + private ConnectionModelFactory connectionModelFactory; + public SmooksGraphicalEditorPart(ISmooksModelProvider provider) { super(); this.editDomain = new DefaultEditDomain(this); @@ -114,16 +121,27 @@ public void commandStackChanged(EventObject event) { final Command mostRecentCommand = ((org.eclipse.emf.common.command.CommandStack) event.getSource()) .getMostRecentCommand(); + final EventObject fe = event; getEditorSite().getShell().getDisplay().asyncExec(new Runnable() { public void run() { if (mostRecentCommand != null) { Command rawCommand = mostRecentCommand; + int commandType = EXECUTE_COMMAND; + if (rawCommand == ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) + .getUndoCommand()) { + commandType = EXECUTE_COMMAND; + } + if (rawCommand == ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) + .getRedoCommand()) { + commandType = UNDO_COMMAND; + } while (rawCommand instanceof CommandWrapper) { rawCommand = ((CommandWrapper) rawCommand).getCommand(); } if (rawCommand instanceof SetCommand || rawCommand instanceof AddCommand || rawCommand instanceof DeleteCommand) { - refershRecentAffectedModel(rawCommand, mostRecentCommand.getAffectedObjects()); + refershRecentAffectedModel(rawCommand, mostRecentCommand.getAffectedObjects(), + commandType); } } } @@ -133,6 +151,36 @@ }); } + public ConnectionModelFactory getConnectionModelFactory() { + if (connectionModelFactory == null) { + connectionModelFactory = createConnectionModelFactory(); + } + return connectionModelFactory; + } + + private ConnectionModelFactory createConnectionModelFactory() { + return new ConnectionModelFactoryImpl(); + } + + public void setConnectionModelFactory(ConnectionModelFactory connectionModelFactory) { + this.connectionModelFactory = connectionModelFactory; + } + + public GraphicalModelFactory getGraphicalModelFactory() { + if (graphicalModelFactory == null) { + graphicalModelFactory = createGraphicalModelFactory(); + } + return graphicalModelFactory; + } + + private GraphicalModelFactory createGraphicalModelFactory() { + return new GraphicalModelFactoryImpl(); + } + + public void setGraphicalModelFactory(GraphicalModelFactoryImpl graphicalModelFactory) { + this.graphicalModelFactory = graphicalModelFactory; + } + @Override protected void createActions() { super.createActions(); @@ -172,82 +220,112 @@ } } - protected void refershRecentAffectedModel(Command command, Collection<?> affectedObjects) { + protected void refershRecentAffectedModel(Command command, Collection<?> affectedObjects, int commandType) { for (Iterator<?> iterator = affectedObjects.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); object = AdapterFactoryEditingDomain.unwrap(object); - if (object == this.smooksResourceList) { - if (command instanceof AddCommand) { - Collection<?> colletion = ((AddCommand) command).getCollection(); - for (Iterator<?> iterator2 = colletion.iterator(); iterator2.hasNext();) { - Object childModel = (Object) iterator2.next(); - childModel = AdapterFactoryEditingDomain.unwrap(childModel); - AbstractSmooksGraphicalModel graphModel = createGraphModel(childModel); - if (graphModel == null) + if (commandType == EXECUTE_COMMAND || commandType == REDO_COMMAND) { + if (object instanceof SmooksResourceListType) { + if (command instanceof AddCommand) { + Collection<?> colletion = ((AddCommand) command).getCollection(); + for (Iterator<?> iterator2 = colletion.iterator(); iterator2.hasNext();) { + Object childModel = (Object) iterator2.next(); + childModel = AdapterFactoryEditingDomain.unwrap(childModel); + AbstractSmooksGraphicalModel graphModel = createGraphModel(childModel); + if (graphModel == null) + continue; + root.addTreeNode(graphModel); + List<TreeNodeConnection> connections = createAllConnection(graphModel); + expandConnectedModels(connections); + } + } + if (command instanceof DeleteCommand) { + Collection<?> colletion = ((DeleteCommand) command).getCollection(); + for (Iterator<?> iterator2 = colletion.iterator(); iterator2.hasNext();) { + Object childModel = (Object) iterator2.next(); + childModel = AdapterFactoryEditingDomain.unwrap(childModel); + AbstractSmooksGraphicalModel graphModel = findGraphicalModel(childModel); + if (graphModel == null) + continue; + AbstractSmooksGraphicalModel.disconnectAllConnections(graphModel); + root.removeTreeNode(graphModel); + } + } + } else { + object = AdapterFactoryEditingDomain.unwrap(object); + AbstractSmooksGraphicalModel node = findGraphicalModel(object); + if (command instanceof SetCommand) { + if (node == null) { continue; - List<TreeNodeConnection> connections = createAllConnection(graphModel); - expandConnectedModels(connections); + } + node.fireVisualChanged(); + EStructuralFeature feature = ((SetCommand) command).getFeature(); + if (SmooksUIUtils.isRelatedConnectionFeature(feature)) { + deleteRelatedConnection(node, feature, (SetCommand) command); + List<TreeNodeConnection> connections = createConnection(node); + node.fireConnectionChanged(); + expandConnectedModels(connections); + } } - } - if (command instanceof DeleteCommand) { - Collection<?> colletion = ((DeleteCommand) command).getCollection(); - for (Iterator<?> iterator2 = colletion.iterator(); iterator2.hasNext();) { - Object childModel = (Object) iterator2.next(); - childModel = AdapterFactoryEditingDomain.unwrap(childModel); - AbstractSmooksGraphicalModel graphModel = findGraphicalModel(childModel); - if (graphModel == null) + if (command instanceof AddCommand) { + Object owner = ((AddCommand) command).getOwner(); + owner = AdapterFactoryEditingDomain.unwrap(owner); + if (owner instanceof SmooksResourceListType) { + AbstractSmooksGraphicalModel graphModel = createGraphModel(object); + if (graphModel == null) + continue; + root.addTreeNode(graphModel); + List<TreeNodeConnection> connections = createAllConnection(graphModel); + expandConnectedModels(connections); + } else { + AbstractSmooksGraphicalModel ownerGraph = findGraphicalModel(owner); + if (ownerGraph != null) { + ownerGraph.fireChildrenChanged(); + } + } + if (node == null) { continue; - AbstractSmooksGraphicalModel.disconnectAllConnections(graphModel); - root.removeTreeNode(graphModel); + } + node.fireChildrenChanged(); + node.fireConnectionChanged(); } + if (command instanceof DeleteCommand) { + Object owner = ((EObject) object).eContainer(); + owner = AdapterFactoryEditingDomain.unwrap(owner); + AbstractSmooksGraphicalModel ownerGraph = findGraphicalModel(owner); + if (ownerGraph != null) { + ownerGraph.fireChildrenChanged(); + } + } } - } else { + continue; + } + + if (commandType == UNDO_COMMAND) { object = AdapterFactoryEditingDomain.unwrap(object); AbstractSmooksGraphicalModel node = findGraphicalModel(object); - if (node == null) { - if (command instanceof DeleteCommand || command instanceof AddCommand) { - Collection<?> cccc = null; - if (command instanceof DeleteCommand) { - cccc = ((DeleteCommand) command).getCollection(); - } - if (command instanceof AddCommand) { - cccc = ((AddCommand) command).getCollection(); - } + if (command instanceof AddCommand) { + if (object instanceof SmooksResourceListType) { + Collection<?> cccc = ((AddCommand) command).getCollection(); for (Iterator<?> iterator2 = cccc.iterator(); iterator2.hasNext();) { Object object2 = (Object) iterator2.next(); object2 = AdapterFactoryEditingDomain.unwrap(object2); - if (object == object2) { - EObject owner = ((EObject) object).eContainer(); - if (owner == this.smooksResourceList) { - object = AdapterFactoryEditingDomain.unwrap(object); - AbstractSmooksGraphicalModel graphModel = createGraphModel(object); - if (graphModel == null) - continue; - List<TreeNodeConnection> connections = createAllConnection(graphModel); - expandConnectedModels(connections); - if (graphModel instanceof IMoveableModel) { - String id = SmooksGraphUtil.generateFigureID(graphModel); - if (id != null) { - FigureType ft = SmooksModelUtils.findFigureType(smooksModelProvider - .getSmooksGraphicsExt().getGraph(), id); - try { - int x = Integer.parseInt(ft.getX()); - int y = Integer.parseInt(ft.getY()); - ((IMoveableModel) graphModel).setLocation(new Point(x, y)); - } catch (Throwable t) { - continue; - } - } - } - } + AbstractSmooksGraphicalModel gmodel = findGraphicalModel(object2); + if (gmodel != null) { + root.removeTreeNode(gmodel); break; } } } else { - continue; + if (node != null) { + node.fireChildrenChanged(); + } } } if (command instanceof SetCommand) { + if (node == null) { + continue; + } node.fireVisualChanged(); EStructuralFeature feature = ((SetCommand) command).getFeature(); if (SmooksUIUtils.isRelatedConnectionFeature(feature)) { @@ -257,26 +335,54 @@ expandConnectedModels(connections); } } - if (command instanceof AddCommand) { - Object owner = ((AddCommand) command).getOwner(); - owner = AdapterFactoryEditingDomain.unwrap(owner); - AbstractSmooksGraphicalModel ownerGraph = findGraphicalModel(owner); - if (ownerGraph != null) { - ownerGraph.fireChildrenChanged(); - } - node.fireChildrenChanged(); - node.fireConnectionChanged(); - } if (command instanceof DeleteCommand) { - Object owner = ((EObject)object).eContainer(); - owner = AdapterFactoryEditingDomain.unwrap(owner); - AbstractSmooksGraphicalModel ownerGraph = findGraphicalModel(owner); - if (ownerGraph != null) { - ownerGraph.fireChildrenChanged(); + Collection<?> cccc = null; + if (command instanceof DeleteCommand) { + cccc = ((DeleteCommand) command).getCollection(); } - node.fireChildrenChanged(); - node.fireConnectionChanged(); + for (Iterator<?> iterator2 = cccc.iterator(); iterator2.hasNext();) { + Object object2 = (Object) iterator2.next(); + object2 = AdapterFactoryEditingDomain.unwrap(object2); + // it means that it's deletecommand undo + if (object == object2) { + EObject owner = ((EObject) object).eContainer(); + if (owner instanceof SmooksResourceListType) { + object = AdapterFactoryEditingDomain.unwrap(object); + AbstractSmooksGraphicalModel graphModel = createGraphModel(object); + if (graphModel == null) + continue; + node = graphModel; + root.addTreeNode(graphModel); + List<TreeNodeConnection> connections = createAllConnection(graphModel); + expandConnectedModels(connections); + if (graphModel instanceof IMoveableModel) { + String id = SmooksGraphUtil.generateFigureID(graphModel); + if (id != null) { + FigureType ft = SmooksModelUtils.findFigureType(smooksModelProvider + .getSmooksGraphicsExt().getGraph(), id); + try { + int x = Integer.parseInt(ft.getX()); + int y = Integer.parseInt(ft.getY()); + ((IMoveableModel) graphModel).setLocation(new Point(x, y)); + } catch (Throwable t) { + continue; + } + } + } + } else { + AbstractSmooksGraphicalModel ownernode = findGraphicalModel(owner); + ownernode.fireChildrenChanged(); + node = findGraphicalModel(object); + if (node == null) + continue; + List<TreeNodeConnection> connections = createAllConnection(node); + expandConnectedModels(connections); + } + break; + } + } } + continue; } } } @@ -302,7 +408,7 @@ if (AdapterFactoryEditingDomain.unwrap(graph.getData()) == object) { return graph; } - List<?> children = graph.getChildren(); + List<?> children = graph.getChildrenWithoutDynamic(); for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { Object child = (Object) iterator.next(); if (child instanceof AbstractSmooksGraphicalModel) { @@ -360,7 +466,7 @@ root = new RootModel(); } else { root.removeAllTreeNode(); - + } Object obj = smooksModelProvider.getSmooksModel(); AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) smooksModelProvider @@ -384,12 +490,14 @@ root.addTreeNode(container); } } - // to find Bean v1.2 SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList(); List<?> arcList = listType.getAbstractResourceConfig(); for (Iterator<?> iterator = arcList.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); - createGraphModel(object); + AbstractSmooksGraphicalModel gmodel = createGraphModel(object); + if (gmodel != null) { + root.addTreeNode(gmodel); + } } getGraphicalViewer().setContents(root); } @@ -406,27 +514,14 @@ } protected AbstractSmooksGraphicalModel createGraphModel(Object model) { - AbstractSmooksGraphicalModel graphModel = null; - if (model instanceof BindingsType) { - AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) smooksModelProvider - .getEditingDomain(); - ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain.getAdapterFactory()); - ILabelProvider labelProvider = new AdapterFactoryLabelProvider(editingDomain.getAdapterFactory()) { - @Override - public String getText(Object object) { - Object obj = AdapterFactoryEditingDomain.unwrap(object); - if (obj instanceof AbstractAnyType) { - return super.getText(obj); - } - return super.getText(object); - } - - }; - graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, this.smooksModelProvider); - ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); - root.addTreeNode(graphModel); + GraphicalModelFactory factory = getGraphicalModelFactory(); + if (factory != null) { + Object gmodel = factory.createGraphicalModel(model, smooksModelProvider); + if (gmodel != null && gmodel instanceof AbstractSmooksGraphicalModel) { + return (AbstractSmooksGraphicalModel) gmodel; + } } - return graphModel; + return null; } protected List<TreeNodeConnection> createConnectionModel() { @@ -457,17 +552,22 @@ } protected List<TreeNodeConnection> createConnection(AbstractSmooksGraphicalModel model) { + ConnectionModelFactory connectionModelFactory = getConnectionModelFactory(); List<TreeNodeConnection> cs = new ArrayList<TreeNodeConnection>(); - if (hasSelectorConnection(model)) { - List<TreeNodeConnection> cList = createSelectorConnection(model); - if (cList != null) { - cs.addAll(cList); + if (connectionModelFactory != null) { + if (connectionModelFactory.hasSelectorConnection(model)) { + List<TreeNodeConnection> cList = connectionModelFactory.createSelectorConnection(inputDataList, root, + model); + if (cList != null) { + cs.addAll(cList); + } } - } - if (hasBeanIDReferenceConnection(model)) { - TreeNodeConnection c = createBeanIDReferenceConnection(model); - if (c != null) { - cs.add(c); + if (connectionModelFactory.hasBeanIDReferenceConnection(model)) { + TreeNodeConnection c = connectionModelFactory.createBeanIDReferenceConnection(smooksModelProvider + .getSmooksModel(), root, model); + if (c != null) { + cs.add(c); + } } } if (cs.isEmpty()) @@ -475,68 +575,6 @@ return cs; } - private TreeNodeConnection createBeanIDReferenceConnection(AbstractSmooksGraphicalModel model) { - // TODO Auto-generated method stub - return null; - } - - private List<TreeNodeConnection> createSelectorConnection(AbstractSmooksGraphicalModel model) { - Object data = model.getData(); - data = AdapterFactoryEditingDomain.unwrap(data); - List<TreeNodeConnection> connections = new ArrayList<TreeNodeConnection>(); - if (data != null && data instanceof EObject) { - EStructuralFeature feature = SmooksGraphUtil.getSelectorFeature((EObject) data); - Object sd = ((EObject) data).eGet(feature); - if (sd != null) { - String selector = sd.toString(); - if (inputDataList != null) { - for (Iterator<?> iterator = inputDataList.iterator(); iterator.hasNext();) { - Object obj = (Object) iterator.next(); - if (obj instanceof IXMLStructuredObject) { - AbstractSmooksGraphicalModel sourceGraphModel = SmooksGraphUtil.findInputGraphModel( - selector, (IXMLStructuredObject) obj, root); - if (sourceGraphModel != null) { - boolean canCreate = true; - List<TreeNodeConnection> tcs = model.getTargetConnections(); - for (Iterator<?> iterator2 = tcs.iterator(); iterator2.hasNext();) { - TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); - if (treeNodeConnection.getSourceNode() == sourceGraphModel) { - canCreate = false; - } - } - - if (!canCreate) { - break; - } - - TreeNodeConnection connection = new TreeNodeConnection(sourceGraphModel, model); - sourceGraphModel.getSourceConnections().add(connection); - sourceGraphModel.fireConnectionChanged(); - model.getTargetConnections().add(connection); - model.fireConnectionChanged(); - connections.add(connection); - } - } - } - } - } - } - return connections; - } - - private boolean hasSelectorConnection(AbstractSmooksGraphicalModel model) { - Object data = model.getData(); - data = AdapterFactoryEditingDomain.unwrap(data); - if (data instanceof EObject) { - return (SmooksGraphUtil.getSelectorFeature((EObject) data) != null); - } - return false; - } - - private boolean hasBeanIDReferenceConnection(AbstractSmooksGraphicalModel model) { - return false; - } - private void createConnection(List<AbstractSmooksGraphicalModel> children, List<TreeNodeConnection> connections) { for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-20 09:31:30 UTC (rev 17181) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-20 09:51:23 UTC (rev 17182) @@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.gef.common.RootModel; @@ -25,6 +26,8 @@ import org.jboss.tools.smooks.model.javabean.JavabeanPackage; import org.jboss.tools.smooks.model.javabean.ValueType; import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; /** * @author Dart @@ -34,6 +37,7 @@ public static String generateFigureID(AbstractSmooksGraphicalModel model) { Object data = model.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); if (data instanceof BindingsType) { String beanId = ((BindingsType) data).getBeanId(); if (beanId == null) { @@ -42,6 +46,16 @@ beanId = beanId.trim(); return "BindingsType_" + beanId; } + + if (data instanceof BeanType) { + String beanId = ((BeanType) data).getBeanId(); + if (beanId == null) { + return null; + } + beanId = beanId.trim(); + return "BeanType" + beanId; + } + if (data instanceof IXMLStructuredObject) { List<?> children = ((IXMLStructuredObject) data).getChildren(); if (children == null || children.isEmpty()) { @@ -60,6 +74,7 @@ public static EStructuralFeature getSelectorFeature(EObject obj) { if (obj == null) return null; + // for javabean 1.1 if (obj instanceof BindingsType) { return JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT; } @@ -69,6 +84,18 @@ if(obj instanceof WiringType){ return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; } + + // for javabean 1.2 + + if(obj instanceof BeanType){ + return Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT; + } + if(obj instanceof org.jboss.tools.smooks.model.javabean12.ValueType){ + return Javabean12Package.Literals.VALUE_TYPE__DATA; + } + if(obj instanceof org.jboss.tools.smooks.model.javabean12.WiringType){ + return Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; + } return null; }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17181 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-08-20 05:31:30 -0400 (Thu, 20 Aug 2009) New Revision: 17181 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java Log: https://jira.jboss.org/jira/browse/JBIDE-4761 Prevent double id-property altering in NamingStrategy. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-20 08:27:30 UTC (rev 17180) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-20 09:31:30 UTC (rev 17181) @@ -468,7 +468,7 @@ protected String getResourceDefaultName() { NamingStrategy namingStrategy = getJpaProject().getNamingStrategy(); if (namingStrategy != null){ - return namingStrategy.classToTableName(javaResourcePersistentType.getName()); + return namingStrategy.classToTableName(javaResourcePersistentType.getQualifiedName()); } return javaResourcePersistentType.getName(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-08-20 08:27:30 UTC (rev 17180) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-08-20 09:31:30 UTC (rev 17181) @@ -193,12 +193,4 @@ return (HibernateJpaProject) super.getJpaProject(); } - @Override - public String getDefaultColumnName() { - NamingStrategy namingStrategy = getJpaProject().getNamingStrategy(); - if (namingStrategy != null && getPersistentAttribute().getName() != null){ - return namingStrategy.propertyToColumnName(getPersistentAttribute().getName()); - } - return super.getDefaultColumnName(); - } }

16 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2009