September 2009 - jbosstools-commits

JBoss Tools SVN: r17653 - trunk/jsf/plugins/org.jboss.tools.jsf.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 06:09:22 -0400 (Fri, 18 Sep 2009) New Revision: 17653 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-18 10:08:24 UTC (rev 17652) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-18 10:09:22 UTC (rev 17653) @@ -27,7 +27,7 @@ </runtime> </extension> - <extension point="org.jboss.tools.common.model.jspAdopt"> + <extension point="org.jboss.tools.jst.web.jspAdopt"> <jspAdopt class="org.jboss.tools.jsf.model.handlers.JSPAdopt"/> </extension>

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17652 - in trunk/common/plugins/org.jboss.tools.common.model: schema and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 06:08:24 -0400 (Fri, 18 Sep 2009) New Revision: 17652 Removed: trunk/common/plugins/org.jboss.tools.common.model/schema/jspAdopt.exsd trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/JSPAdopt.java Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18 10:08:24 UTC (rev 17652) @@ -6,7 +6,6 @@ <extension-point id="modelObjectAdapter" name="modelObjectAdapter" schema="schema/modelObjectAdapter.exsd"/> <extension-point id="meta" name="meta" schema="schema/meta.exsd"/> <extension-point id="keys" name="keys" schema="schema/keys.exsd"/> - <extension-point id="jspAdopt" name="jspAdopt" schema="schema/jspAdopt.exsd"/> <extension-point id="paletteAdopt" name="paletteAdopt" schema="schema/paletteAdopt.exsd"/> <extension-point id="resourceMapping" name="resourceMapping" schema="schema/resourceMapping.exsd"/> <extension-point id="classes" name="Model Classes" schema="schema/classes.exsd"/> @@ -130,8 +129,6 @@ class="org.jboss.tools.common.model.engines.impl.EnginesLoader"/> <xclass id="org.jboss.tools.common.model.engines.impl.StopProcessHandler" class="org.jboss.tools.common.model.engines.impl.StopProcessHandler"/> - <xclass id="org.jboss.tools.common.model.files.handlers.JSPAdopt" - class="org.jboss.tools.common.model.files.handlers.JSPAdopt"/> <xclass id="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler" class="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler"/> <xclass id="org.jboss.tools.common.model.filesystems.impl.CreateFileHandler" Deleted: trunk/common/plugins/org.jboss.tools.common.model/schema/jspAdopt.exsd =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/schema/jspAdopt.exsd 2009-09-18 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/schema/jspAdopt.exsd 2009-09-18 10:08:24 UTC (rev 17652) @@ -1,108 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<schema targetNamespace="org.jboss.tools.common.model"> -<annotation> - <appInfo> - <meta.schema plugin="org.jboss.tools.common.model" id="jspAdopt" name="jspAdopt"/> - </appInfo> - <documentation> - Registers class implementating interface - org.jboss.tools.common.meta.XAdoptManager - in class org.jboss.tools.common.model.files.handlers.JSPAdopt, - which checks if a dragged model object can be dropped - to *.jsp file and then executes the drop, delegating - the check and execution to registered implementations. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="jspAdopt" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="jspAdopt"> - <complexType> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - Qualified name of class implementing interface - org.jboss.tools.common.meta.XAdoptManager - </documentation> - <appInfo> - <meta.attribute kind="java"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 2.0.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Red Hat, Inc - </documentation> - </annotation> - -</schema> Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2009-09-18 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2009-09-18 10:08:24 UTC (rev 17652) @@ -25,6 +25,7 @@ import org.jboss.tools.common.meta.impl.XMetaDataConstants; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.impl.*; +import org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer; import org.jboss.tools.common.model.plugin.ModelMessages; import org.jboss.tools.common.model.util.*; import org.jboss.tools.common.util.FileUtil; @@ -267,12 +268,19 @@ String entity = version == null ? null : (String)versionEntities.get(version); if(entity != null) return entity; } - return ("jsp".equals(extension)) ? "FileJSP" : //$NON-NLS-1$ //$NON-NLS-2$ - ("htm".equals(extension)) ? "FileHTML" : //$NON-NLS-1$ //$NON-NLS-2$ - ("html".equals(extension)) ? "FileHTML" : //$NON-NLS-1$ //$NON-NLS-2$ - ("properties".equals(extension)) ? "FilePROPERTIES" : //$NON-NLS-1$ //$NON-NLS-2$ - (extension.equals(action.getProperty(XModelObjectConstants.ATTR_NAME_EXTENSION))) ? action.getProperty(XMetaDataConstants.ENTITY) : - "FileAny"; //$NON-NLS-1$ + + String entity = null; + if(extension.equals(action.getProperty(XModelObjectConstants.ATTR_NAME_EXTENSION))) { + entity = action.getProperty(XMetaDataConstants.ENTITY); + } + if(entity == null) { + entity = new MappedEntityRecognizer().getEntityName(extension, null); + } + if(entity != null && getTarget().getModel().getMetaData().getEntity(entity) != null) { + return entity; + } + + return "FileAny"; //$NON-NLS-1$ } protected XModelObject modifyCreatedObject(XModelObject o) { Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/JSPAdopt.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/JSPAdopt.java 2009-09-18 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/JSPAdopt.java 2009-09-18 10:08:24 UTC (rev 17652) @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.files.handlers; - -import org.jboss.tools.common.meta.*; -import org.jboss.tools.common.meta.action.impl.*; - -public class JSPAdopt extends CompoundAdoptManager { - /* - * see extension point org.jboss.tools.common.model.jspAdopt - private static String[] MANAGERS = {"org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt", - "org.jboss.tools.struts.tiles.model.handlers.JSPAdopt", - "org.jboss.tools.struts.model.handlers.JSPAdopt", - "org.jboss.tools.jsf.model.handlers.JSPAdopt", - "org.jboss.tools.jsf.ui.adopt.JSPAdopt", - "org.jboss.tools.jst.web.model.handlers.JSPAdopt", - }; - */ - private static XAdoptManager[] managers = null; - - public XAdoptManager[] getManagers() { - if(managers == null) managers = loadManagers("org.jboss.tools.common.model.jspAdopt"); //$NON-NLS-1$ - return managers; - } - -} -

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17651 - in trunk/jst/plugins/org.jboss.tools.jst.web: resources/meta and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 06:06:58 -0400 (Fri, 18 Sep 2009) New Revision: 17651 Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 10:06:58 UTC (rev 17651) @@ -6,5 +6,6 @@ about.html,\ META-INF/,\ web.jar,\ - catalog/ + catalog/,\ + schema/ additional.bundles = org.eclipse.jem.util Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 10:06:58 UTC (rev 17651) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <plugin> + <extension-point id="jspAdopt" name="JSP Adopt" schema="schema/jspAdopt.exsd"/> <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/studio_eclipse_option.meta"> @@ -33,7 +34,7 @@ </specialwizard> </extension> - <extension point="org.jboss.tools.common.model.jspAdopt"> + <extension point="org.jboss.tools.jst.web.jspAdopt"> <jspAdopt class="org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt"/> <jspAdopt class="org.jboss.tools.jst.web.model.handlers.JSPAdopt"/> </extension> @@ -118,6 +119,8 @@ class="org.jboss.tools.jst.web.model.handlers.FindReferringItemHandler"/> <xclass id="org.jboss.tools.jst.web.model.handlers.JSPAdopt" class="org.jboss.tools.jst.web.model.handlers.JSPAdopt"/> + <xclass id="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" + class="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt"/> <xclass id="org.jboss.tools.jst.web.model.handlers.JumpToTransitionTargetHandler" class="org.jboss.tools.jst.web.model.handlers.JumpToTransitionTargetHandler"/> <xclass id="org.jboss.tools.jst.web.model.handlers.RegisterInServerXmlHandler" Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta 2009-09-18 10:06:58 UTC (rev 17651) @@ -52,7 +52,7 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%HTML%" name="FileHTML"> @@ -143,7 +143,7 @@ <XDependencies/> </XModelEntity> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%JSP%" name="FileJSP"> @@ -233,7 +233,7 @@ <XDependencies/> </XModelEntity> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%HTML%" name="FileXHTML"> Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd 2009-09-18 10:06:58 UTC (rev 17651) @@ -0,0 +1,103 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.jst.web" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.tools.jst.web" id="jspAdopt" name="JSP Adopt"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence> + <element ref="jspAdopt" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="jspAdopt"> + <complexType> + <attribute name="class" type="string"> + <annotation> + <documentation> + Qualified name of class implementing interface + org.jboss.tools.common.meta.XAdoptManager + </documentation> + <appInfo> + <meta.attribute kind="java"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.model.handlers; + +import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.meta.action.impl.CompoundAdoptManager; + +public class JSPCompoundAdopt extends CompoundAdoptManager { + /* + * see extension point org.jboss.tools.common.model.jspAdopt + private static String[] MANAGERS = {"org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt", + "org.jboss.tools.struts.tiles.model.handlers.JSPAdopt", + "org.jboss.tools.struts.model.handlers.JSPAdopt", + "org.jboss.tools.jsf.model.handlers.JSPAdopt", + "org.jboss.tools.jsf.ui.adopt.JSPAdopt", + "org.jboss.tools.jst.web.model.handlers.JSPAdopt", + }; + */ + private static XAdoptManager[] managers = null; + + public XAdoptManager[] getManagers() { + if(managers == null) managers = loadManagers("org.jboss.tools.jst.web.jspAdopt"); //$NON-NLS-1$ + return managers; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -14,7 +14,7 @@ public class TLDUtil { static String FILE_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1."; //$NON-NLS-1$ - static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag21."; //$NON-NLS-1$ + static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag20.TLDTag21."; //$NON-NLS-1$ static String ATTR_ENTITIES = ".TLDAttribute.TLDAttribute12."; //$NON-NLS-1$ public static boolean isTaglib(XModelObject o) {

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17650 - trunk/struts/plugins/org.jboss.tools.struts/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 05:19:45 -0400 (Fri, 18 Sep 2009) New Revision: 17650 Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties 2009-09-18 09:18:49 UTC (rev 17649) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties 2009-09-18 09:19:45 UTC (rev 17650) @@ -1022,4 +1022,16 @@ #Wizard-Labels.end +# START NON-TRANSLATABLE +JSPLinkRecognizer_CreateLink=/model/OptionsEditor.html +# END NON-TRANSLATABLE +JSPLinkRecognizer_CreateLink.WindowTitle=Add Link Recognizer Rule +JSPLinkRecognizer_CreateLink.Title=Link Recognizer Rule +# START NON-TRANSLATABLE +JSPLink_Edit=/model/OptionsEditor.html +# END NON-TRANSLATABLE +JSPLink_Edit.WindowTitle=Edit +JSPLink_Edit.Title=Link Recognizer Rule + + Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties 2009-09-18 09:18:49 UTC (rev 17649) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties 2009-09-18 09:19:45 UTC (rev 17650) @@ -59,3 +59,7 @@ StrutsGen11_Forwards_properties=Generate JavaBeans properties StrutsGen11_Exceptions_base_class=\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9 StrutsGen11_Exceptions_properties=Generate JavaBeans properties +JSPLinkRecognizer_CreateLink.WindowTitle=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB\u306E\u8FFD\u52A0 +JSPLinkRecognizer_CreateLink.Title=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB +JSPLink_Edit.WindowTitle=\u7DE8\u96C6 +JSPLink_Edit.Title=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17649 - in trunk/jst/plugins/org.jboss.tools.jst.web: resources/help and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 05:18:49 -0400 (Fri, 18 Sep 2009) New Revision: 17649 Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:15:20 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:18:49 UTC (rev 17649) @@ -19,6 +19,8 @@ </meta> <meta path="meta/web-template.meta"> </meta> + <meta path="meta/page-files.meta"> + </meta> </extension> <extension point="org.jboss.tools.common.model.keys"> <keys path="help/keys-web.properties"/> Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2009-09-18 09:15:20 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2009-09-18 09:18:49 UTC (rev 17649) @@ -1,6 +1,111 @@ WebPrjAdoptStepName.web.xml_location=web.xml Location ##### Some Files ##### +##### File JSP ##### + +# START NON-TRANSLATABLE +FileJSP=/model/FileJSP.html +# END NON-TRANSLATABLE +# START NON-TRANSLATABLE +FileJSP_Properties=/model/FileJSP.html +# END NON-TRANSLATABLE +FileJSP_Properties.Title=File JSP +# START NON-TRANSLATABLE +FileJSP_Rename=/model/FileJSP.html +# END NON-TRANSLATABLE + +##### Create File JSP ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileJSP=/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileJSP.WindowTitle=New File JSP +FileFolder_CreateFileJSP.Title=File JSP +FileFolder_CreateFileJSP_1.Title=Select Tag Libraries + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileJSP=/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileJSP.WindowTitle=New File JSP +FileSystemFolder_CreateFileJSP.Title=File JSP +FileSystemFolder_CreateFileJSP_1.Title=Select Tag Libraries + +##### File XHTML ##### + +# START NON-TRANSLATABLE +FileXHTML_Properties=/model/FileProperty.html +# END NON-TRANSLATABLE +FileXHTML_Properties.Title=File XHTML +# START NON-TRANSLATABLE +FileXHTML_Rename=/model/FileXHTML.html +# END NON-TRANSLATABLE + +##### Create File JSP ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileXHTML=/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileXHTML.WindowTitle=New File XHTML +FileFolder_CreateFileXHTML.Title=File XHTML +FileFolder_CreateFileXHTML_1.Title=Select Tag Libraries + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileXHTML=/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileXHTML.WindowTitle=New File XHTML +FileSystemFolder_CreateFileXHTML.Title=File XHTML +FileSystemFolder_CreateFileXHTML_1.Title=Select Tag Libraries + +##### File HTML ##### +# START NON-TRANSLATABLE +FileHTML=/model/FileHTML.html +# END NON-TRANSLATABLE + +# START NON-TRANSLATABLE +FileHTML_Properties=/model/FileProperty.html +# END NON-TRANSLATABLE +FileHTML_Properties.Title=File HTML +# START NON-TRANSLATABLE +FileHTML_Rename=/model/FileHTML.html +# END NON-TRANSLATABLE + +##### Create File HTML ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileHTML=/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileHTML.WindowTitle=New File HTML +FileFolder_CreateFileHTML.Title=File HTML + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileHTML=/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileHTML.WindowTitle=New File HTML +FileSystemFolder_CreateFileHTML.Title=File HTML + +##### File XSL ##### + +# START NON-TRANSLATABLE +FileXSL=/model/FileXSL.html +# END NON-TRANSLATABLE + +# START NON-TRANSLATABLE +FileXSL_Properties=/model/FileProperty.html +# END NON-TRANSLATABLE +FileXSL_Properties.Title=File XSL + +##### Create File XSL ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileXSL=/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileXSL.WindowTitle=New File XSL + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileXSL=/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileXSL.WindowTitle=New File XSL + ##### Create CSS and JS File ##### FileFolder_CreateFileCSS=/model/noHelpYet.html Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.properties 2009-09-18 09:15:20 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.properties 2009-09-18 09:18:49 UTC (rev 17649) @@ -1,4 +1,26 @@ WebPrjAdoptStepName.web.xml_location=web.xml \u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +FileJSP_Properties.Title=JSP \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileJSP.WindowTitle=\u65B0\u898F JSP \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileJSP.Title=JSP \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileJSP_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileSystemFolder_CreateFileJSP.WindowTitle=\u65B0\u898F JSP \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileJSP.Title=JSP \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileJSP_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileXHTML_Properties.Title=XHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXHTML.WindowTitle=\u65B0\u898F XHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXHTML.Title=XHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXHTML_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileSystemFolder_CreateFileXHTML.WindowTitle=\u65B0\u898F XHTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileXHTML.Title=XHTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileXHTML_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileHTML_Properties.Title=HTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileHTML.WindowTitle=\u65B0\u898F HTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileHTML.Title=HTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileHTML.WindowTitle=\u65B0\u898F HTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileHTML.Title=HTML \u30D5\u30A1\u30A4\u30EB +FileXSL_Properties.Title=XSL \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXSL.WindowTitle=\u65B0\u898F XSL \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileXSL.WindowTitle=\u65B0\u898F XSL \u30D5\u30A1\u30A4\u30EB FileFolder_CreateFileCSS=/model/noHelpYet.html FileFolder_CreateFileCSS.WindowTitle=\u65B0\u898F CSS \u30D5\u30A1\u30A4\u30EB FileFolder_CreateFileCSS.Title=CSS \u30D5\u30A1\u30A4\u30EB Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta 2009-09-18 09:18:49 UTC (rev 17649) @@ -0,0 +1,438 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION MODULE="Model" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="MappedEntities"> + <PAIR name="bpf" value="FileProcess"/> + <PAIR name="htm" value="FileHTML"/> + <PAIR name="jspx" value="FileJSP"/> + <PAIR name="jspf" value="FileJSP"/> + <PAIR name="jsf" value="FileHTML"/> + </MAPPING> + <MAPPING name="ObjectEditor"> + <PAIR name="Flow" value="DefaultEditor"/> + <PAIR name="HTML" value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> + <PAIR name="JSP" value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> + <PAIR name="XSL" value="org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor"/> + </MAPPING> + <MAPPING name="Recognizers"> + <PAIR name="htm$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="html$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="jsf$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="jsp$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="jspf$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="jspx$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="xhtml$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + <PAIR name="xsl$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="action"> + <GROUP name="new"> + <GROUP name="file"> + <ICON name="html_file" path="images/file/new_html_file.gif"/> + <ICON name="jsp_file" path="images/file/new_jsp_file.gif"/> + <ICON name="xhtml_file" path="images/file/new_html_file.gif"/> + <ICON name="xsl_file" path="images/file/new_xsl_file.gif"/> + </GROUP> + </GROUP> + </GROUP> + <GROUP name="main"> + <GROUP name="file"> + <ICON name="html_file" path="images/file/html_file.gif"/> + <ICON name="jsp" path="images/file/jsp_file.gif"/> + <ICON name="jsp_file" path="images/file/jsp_file.gif"/> + <ICON name="xhtml_file" path="images/file/html_file.gif"/> + <ICON name="xsl" path="images/file/xsl_file.gif"/> + <ICON name="xsl_file" path="images/file/xsl_file.gif"/> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity + AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" + ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" + ObjectEditorClass="%HTML%" name="FileHTML"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.file.html_file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="html" loader="ElementType" + name="element type" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> + <XModelAttribute default="html" name="extension" xmlname="EXTENSION"> + <Constraint loader="List"> + <value name="html"/> + <value name="htm"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HandlerClassName="%Open%" ICON="main.file.html_file" + displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="main.file.java_file" displayName="Open External Editor" + kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="main.file.java_file" displayName="Choose Program..." + kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" HandlerClassName="%RenameFile%" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FileHTML"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HIDE="always" + HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" + kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" + ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" + ObjectEditorClass="%JSP%" name="FileJSP"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.file.jsp_file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="jsp file" loader="ElementType" + name="element type" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute COPYABLE="no" loader="ModelPath" name="model path" visibility="false"> + <Editor name="Uneditable" viewer="%View%"/> + </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> + <XModelAttribute default="jsp" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HandlerClassName="%Open%" ICON="main.file.jsp_file" + displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="main.file.java_file" displayName="Open External Editor" + kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="main.file.java_file" displayName="Choose Program..." + kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" HandlerClassName="%RenameFile%" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FileJSP"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HIDE="always" + HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" + kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" + ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" + ObjectEditorClass="%HTML%" name="FileXHTML"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.file.xhtml_file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="html" loader="ElementType" + name="element type" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> + <XModelAttribute default="xhtml" name="extension" xmlname="EXTENSION"> + <Constraint loader="List"> + <value name="html"/> + <value name="htm"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HandlerClassName="%Open%" ICON="main.file.html_file" + displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="main.file.java_file" displayName="Open External Editor" + kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="main.file.java_file" displayName="Choose Program..." + kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" HandlerClassName="%RenameFile%" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FileHTML"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HIDE="always" + HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" + kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" + ImplementingClass="org.jboss.tools.common.model.filesystems.impl.FileXMLImpl" + ObjectEditorClass="%XML%" name="FileXSL"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.file.xsl_file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="folder" loader="ElementType" + name="element type" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> + <XModelAttribute default="xsl" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HandlerClassName="%Open%" ICON="main.file.xsl_file" + displayName="Open" kind="action" name="Open"/> + <XActionItem kind="list" name="EditActions"> + <XActionItem HandlerClassName="%RenameFile%" ICON="action.empty" + PROPERTIES="validator.edit=true" WizardClassName="%Default%" + displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FileXSL"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity name="NewJSPFileWizardTaglibs"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes> + <XModelAttribute name="taglibs"> + <Constraint loader="ListAdd"/> + <Editor name="ListAdd"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"/> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileFolder"> + <XChildrenEntities> + <XChildEntity name="FileJSP"/> + <XChildEntity name="FileXSL"/> + <XChildEntity name="FileHTML"/> + <XChildEntity name="FileXHTML"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="FileSystemFolder"> + <XChildrenEntities> + <XChildEntity name="FileJSP"/> + <XChildEntity name="FileHTML"/> + <XChildEntity name="FileXSL"/> + <XChildEntity name="FileXHTML"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="FileSystemJar"> + <XChildrenEntities> + <XChildEntity name="FileJSP"/> + <XChildEntity name="FileHTML"/> + <XChildEntity name="FileXSL"/> + <XChildEntity name="FileXHTML"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="JarFolder"> + <XChildrenEntities> + <XChildEntity name="FileJSP"/> + <XChildEntity name="FileXSL"/> + <XChildEntity name="FileHTML"/> + <XChildEntity name="FileXHTML"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> +</XModelEntityGroup>

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17648 - in trunk/common/plugins/org.jboss.tools.common.model: resources/help and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 05:15:20 -0400 (Fri, 18 Sep 2009) New Revision: 17648 Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model_ja.properties trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.meta trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesystems.meta trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/MappedEntityRecognizer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2009-09-18 09:15:20 UTC (rev 17648) @@ -11,7 +11,6 @@ Export-Package: org.jboss.tools.common.ant.model, org.jboss.tools.common.ant.model.handlers, org.jboss.tools.common.ant.parser, - org.jboss.tools.common.java.jsp.model, org.jboss.tools.common.java.model.handler, org.jboss.tools.common.meta, org.jboss.tools.common.meta.action, Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2009-09-18 09:15:20 UTC (rev 17648) @@ -191,111 +191,6 @@ FileSystemFolder_CreateFile.WindowTitle=New File FileSystemFolder_CreateFile.Title=File -##### File JSP ##### - -# START NON-TRANSLATABLE -FileJSP=/model/FileJSP.html -# END NON-TRANSLATABLE -# START NON-TRANSLATABLE -FileJSP_Properties=/model/FileJSP.html -# END NON-TRANSLATABLE -FileJSP_Properties.Title=File JSP -# START NON-TRANSLATABLE -FileJSP_Rename=/model/FileJSP.html -# END NON-TRANSLATABLE - -##### Create File JSP ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileJSP=/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileJSP.WindowTitle=New File JSP -FileFolder_CreateFileJSP.Title=File JSP -FileFolder_CreateFileJSP_1.Title=Select Tag Libraries - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileJSP=/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileJSP.WindowTitle=New File JSP -FileSystemFolder_CreateFileJSP.Title=File JSP -FileSystemFolder_CreateFileJSP_1.Title=Select Tag Libraries - -##### File XHTML ##### - -# START NON-TRANSLATABLE -FileXHTML_Properties=/model/FileProperty.html -# END NON-TRANSLATABLE -FileXHTML_Properties.Title=File XHTML -# START NON-TRANSLATABLE -FileXHTML_Rename=/model/FileXHTML.html -# END NON-TRANSLATABLE - -##### Create File JSP ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileXHTML=/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileXHTML.WindowTitle=New File XHTML -FileFolder_CreateFileXHTML.Title=File XHTML -FileFolder_CreateFileXHTML_1.Title=Select Tag Libraries - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileXHTML=/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileXHTML.WindowTitle=New File XHTML -FileSystemFolder_CreateFileXHTML.Title=File XHTML -FileSystemFolder_CreateFileXHTML_1.Title=Select Tag Libraries - -##### File HTML ##### -# START NON-TRANSLATABLE -FileHTML=/model/FileHTML.html -# END NON-TRANSLATABLE - -# START NON-TRANSLATABLE -FileHTML_Properties=/model/FileProperty.html -# END NON-TRANSLATABLE -FileHTML_Properties.Title=File HTML -# START NON-TRANSLATABLE -FileHTML_Rename=/model/FileHTML.html -# END NON-TRANSLATABLE - -##### Create File HTML ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileHTML=/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileHTML.WindowTitle=New File HTML -FileFolder_CreateFileHTML.Title=File HTML - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileHTML=/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileHTML.WindowTitle=New File HTML -FileSystemFolder_CreateFileHTML.Title=File HTML - -##### File XSL ##### - -# START NON-TRANSLATABLE -FileXSL=/model/FileXSL.html -# END NON-TRANSLATABLE - -# START NON-TRANSLATABLE -FileXSL_Properties=/model/FileProperty.html -# END NON-TRANSLATABLE -FileXSL_Properties.Title=File XSL - -##### Create File XSL ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileXSL=/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileXSL.WindowTitle=New File XSL - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileXSL=/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileXSL.WindowTitle=New File XSL - ##### Create File Properties ##### # START NON-TRANSLATABLE @@ -637,18 +532,6 @@ TrialLimitation=/limitedversion.html # END NON-TRANSLATABLE -# START NON-TRANSLATABLE -JSPLinkRecognizer_CreateLink=/model/OptionsEditor.html -# END NON-TRANSLATABLE -JSPLinkRecognizer_CreateLink.WindowTitle=Add Link Recognizer Rule -JSPLinkRecognizer_CreateLink.Title=Link Recognizer Rule - -# START NON-TRANSLATABLE -JSPLink_Edit=/model/OptionsEditor.html -# END NON-TRANSLATABLE -JSPLink_Edit.WindowTitle=Edit -JSPLink_Edit.Title=Link Recognizer Rule - #Wizard-Common.begin org.jboss.tools.jst.web.ui.wizards.project.ImportWebWarWizard.mainPagePrompt=Select *.war file Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model_ja.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model_ja.properties 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model_ja.properties 2009-09-18 09:15:20 UTC (rev 17648) @@ -34,28 +34,6 @@ FileFolder_CreateFile.Title=\u30D5\u30A1\u30A4\u30EB FileSystemFolder_CreateFile.WindowTitle=\u65B0\u898F\u30D5\u30A1\u30A4\u30EB FileSystemFolder_CreateFile.Title=\u30D5\u30A1\u30A4\u30EB -FileJSP_Properties.Title=JSP \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileJSP.WindowTitle=\u65B0\u898F JSP \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileJSP.Title=JSP \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileJSP_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileSystemFolder_CreateFileJSP.WindowTitle=\u65B0\u898F JSP \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileJSP.Title=JSP \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileJSP_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileXHTML_Properties.Title=XHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXHTML.WindowTitle=\u65B0\u898F XHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXHTML.Title=XHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXHTML_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileSystemFolder_CreateFileXHTML.WindowTitle=\u65B0\u898F XHTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileXHTML.Title=XHTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileXHTML_1.Title=\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileHTML_Properties.Title=HTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileHTML.WindowTitle=\u65B0\u898F HTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileHTML.Title=HTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileHTML.WindowTitle=\u65B0\u898F HTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileHTML.Title=HTML \u30D5\u30A1\u30A4\u30EB -FileXSL_Properties.Title=XSL \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXSL.WindowTitle=\u65B0\u898F XSL \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileXSL.WindowTitle=\u65B0\u898F XSL \u30D5\u30A1\u30A4\u30EB FileFolder_CreateFileProperties.WindowTitle=\u65B0\u898F\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB FileFolder_CreateFileProperties.Title=\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB FileSystemFolder_CreateFileProperties.WindowTitle=\u65B0\u898F\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB @@ -124,10 +102,6 @@ SharableReportProblem.eMail=E-Mail SharableReportProblem.attachRedHatLog=\u5831\u544A\u306B\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3092\u542B\u3081\u308B SharableReportProblem.attachEclipseLog=\u5831\u544A\u306B Eclipse .log \u3092\u542B\u3081\u308B -JSPLinkRecognizer_CreateLink.WindowTitle=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB\u306E\u8FFD\u52A0 -JSPLinkRecognizer_CreateLink.Title=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB -JSPLink_Edit.WindowTitle=\u7DE8\u96C6 -JSPLink_Edit.Title=\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB org.jboss.tools.jst.web.ui.wizards.project.ImportWebWarWizard.mainPagePrompt=*.war \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 WebPrjAdoptStepName_web.xml_location=web.xml \u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 WebPrjAdoptStepName_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.meta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.meta 2009-09-18 09:15:20 UTC (rev 17648) @@ -91,20 +91,12 @@ </MAPPING> <MAPPING name="ObjectEditor"> <PAIR name="DEFAULT" value="DefaultEditor"/> - <PAIR name="Flow" value="DefaultEditor"/> - <PAIR name="HTML" value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> <PAIR name="JAVA" value="DefaultEditor"/> - <PAIR name="JSP" value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> <PAIR name="PROPERTIES" value="DefaultEditor"/> <PAIR name="REFERENCE" value="DefaultEditor"/> <PAIR name="XML" value="org.jboss.tools.common.model.ui.editor.EditorPartWrapper"/> - <PAIR name="XSL" value="org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor"/> </MAPPING> - <MAPPING name="Recognizers"> - <PAIR name="jsp$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="jspf$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="jspx$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - </MAPPING> + <MAPPING name="Recognizers"/> <MAPPING name="Roots"> <PAIR name="Editor" value="XStudio/Options/Editor"/> <PAIR name="Icons" value="XStudio/Icons"/> @@ -139,16 +131,12 @@ <GROUP name="file"> <ICON name="ant_file" path="images/file/new_ant_file.gif"/> <ICON name="folder" path="images/file/new_folder.gif"/> - <ICON name="html_file" path="images/file/new_html_file.gif"/> <ICON name="jar_file" path="images/file/new_jar_file.gif"/> <ICON name="java_file" path="images/file/new_java_file.gif"/> - <ICON name="jsp_file" path="images/file/new_jsp_file.gif"/> <ICON name="new_property" path="images/navigationtree/new_property.gif"/> <ICON name="properties" path="images/file/new_properties_file.gif"/> <ICON name="unknow_file" path="images/file/new_unknow_file.gif"/> - <ICON name="xhtml_file" path="images/file/new_html_file.gif"/> <ICON name="xml_file" path="images/file/new_xml_file.gif"/> - <ICON name="xsl_file" path="images/file/new_xsl_file.gif"/> </GROUP> <GROUP name="state"> <ICON name="base" path="images/flow/create_base.gif"/> @@ -205,21 +193,15 @@ <ICON name="closed_folder" path="images/file/closed_folder.gif"/> <ICON name="folder" path="images/file/closed_folder.gif"/> <ICON name="gif_file" path="images/file/gif_file.gif"/> - <ICON name="html_file" path="images/file/html_file.gif"/> <ICON name="jar_file" path="images/file/jar_file.gif"/> <ICON name="java_file" path="images/file/java_file.gif"/> - <ICON name="jsp" path="images/file/jsp_file.gif"/> - <ICON name="jsp_file" path="images/file/jsp_file.gif"/> <ICON name="openned_folder" path="images/file/openned_folder.gif"/> <ICON name="redhat_folder" path="images/file/redhat_folder.gif"/> <ICON name="root" path="images/file/storage_folder.gif"/> <ICON name="system_folder" path="images/file/system_folder.gif"/> <ICON name="to_top_folder" path="images/file/to_top_folder.gif"/> <ICON name="unknow_file" path="images/file/unknow_file.gif"/> - <ICON name="xhtml_file" path="images/file/html_file.gif"/> <ICON name="xml_file" path="images/file/xml_file.gif"/> - <ICON name="xsl" path="images/file/xsl_file.gif"/> - <ICON name="xsl_file" path="images/file/xsl_file.gif"/> </GROUP> <GROUP name="methods"> <ICON name="java" path="images/java/method.gif"/> Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2009-09-18 09:15:20 UTC (rev 17648) @@ -90,187 +90,6 @@ <XDependencies/> </XModelEntity> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" - ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" - ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" - ObjectEditorClass="%HTML%" name="FileHTML"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.file.html_file" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="html" loader="ElementType" - name="element type" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"/> - <XModelAttribute TRIM="no" name="body" visibility="false"/> - <XModelAttribute default="html" name="extension" xmlname="EXTENSION"> - <Constraint loader="List"> - <value name="html"/> - <value name="htm"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem HandlerClassName="%Open%" ICON="main.file.html_file" - displayName="Open" kind="action" name="Open"/> - <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" - ICON="main.file.java_file" displayName="Open External Editor" - kind="action" name="OpenWithSelected"/> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" - ICON="main.file.java_file" displayName="Choose Program..." - kind="action" name="OpenWithChoice"> - <EntityData EntityName="OpenWithHelper"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="default"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HIDE="always" HandlerClassName="%RenameFile%" - ICON="action.empty" PROPERTIES="validator.edit=true" - WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> - <EntityData EntityName="FileHTML"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" - ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> - </XActionItem> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem kind="list" name="SaveActions"> - <XActionItem HIDE="always" HandlerClassName="%SaveFile%" - ICON="action.save" displayName="Save" kind="action" name="Save"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Paste" HIDE="always" - HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" - kind="action" name="Paste"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem kind="list" name="DiscardActions"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" - ICON="action.delete" - PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" - displayName="Discard Changes" kind="action" name="Discard"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" - ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" - ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" - ObjectEditorClass="%JSP%" name="FileJSP"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.file.jsp_file" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="jsp file" loader="ElementType" - name="element type" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute COPYABLE="no" loader="ModelPath" name="model path" visibility="false"> - <Editor name="Uneditable" viewer="%View%"/> - </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"/> - <XModelAttribute TRIM="no" name="body" visibility="false"/> - <XModelAttribute default="jsp" name="extension" xmlname="EXTENSION"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem HandlerClassName="%Open%" ICON="main.file.jsp_file" - displayName="Open" kind="action" name="Open"/> - <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" - ICON="main.file.java_file" displayName="Open External Editor" - kind="action" name="OpenWithSelected"/> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" - ICON="main.file.java_file" displayName="Choose Program..." - kind="action" name="OpenWithChoice"> - <EntityData EntityName="OpenWithHelper"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="default"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HIDE="always" HandlerClassName="%RenameFile%" - ICON="action.empty" PROPERTIES="validator.edit=true" - WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> - <EntityData EntityName="FileJSP"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" - ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> - </XActionItem> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem kind="list" name="SaveActions"> - <XActionItem HIDE="always" HandlerClassName="%SaveFile%" - ICON="action.save" displayName="Save" kind="action" name="Save"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Paste" HIDE="always" - HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" - kind="action" name="Paste"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem kind="list" name="DiscardActions"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" - ICON="action.delete" - PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" - displayName="Discard Changes" kind="action" name="Discard"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.PropertiesLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.FilePropertiesImpl" ObjectEditorClass="org.jboss.tools.common.propertieseditor.PropertiesCompoundEditor" name="FilePROPERTIES"> @@ -445,161 +264,6 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" - ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" - ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" - ObjectEditorClass="%HTML%" name="FileXHTML"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.file.xhtml_file" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="html" loader="ElementType" - name="element type" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"/> - <XModelAttribute TRIM="no" name="body" visibility="false"/> - <XModelAttribute default="xhtml" name="extension" xmlname="EXTENSION"> - <Constraint loader="List"> - <value name="html"/> - <value name="htm"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem HandlerClassName="%Open%" ICON="main.file.html_file" - displayName="Open" kind="action" name="Open"/> - <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" - ICON="main.file.java_file" displayName="Open External Editor" - kind="action" name="OpenWithSelected"/> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" - ICON="main.file.java_file" displayName="Choose Program..." - kind="action" name="OpenWithChoice"> - <EntityData EntityName="OpenWithHelper"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="default"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HIDE="always" HandlerClassName="%RenameFile%" - ICON="action.empty" PROPERTIES="validator.edit=true" - WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> - <EntityData EntityName="FileHTML"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" - ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> - </XActionItem> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem kind="list" name="SaveActions"> - <XActionItem HIDE="always" HandlerClassName="%SaveFile%" - ICON="action.save" displayName="Save" kind="action" name="Save"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Paste" HIDE="always" - HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" - kind="action" name="Paste"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem kind="list" name="DiscardActions"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" - ICON="action.delete" - PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" - displayName="Discard Changes" kind="action" name="Discard"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity - ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" - ImplementingClass="org.jboss.tools.common.model.filesystems.impl.FileXMLImpl" - ObjectEditorClass="%XML%" name="FileXSL"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.file.xsl_file" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="folder" loader="ElementType" - name="element type" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"/> - <XModelAttribute TRIM="no" name="body" visibility="false"/> - <XModelAttribute default="xsl" name="extension" xmlname="EXTENSION"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Editor name="Uneditable"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem HandlerClassName="%Open%" ICON="main.file.xsl_file" - displayName="Open" kind="action" name="Open"/> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%RenameFile%" ICON="action.empty" - PROPERTIES="validator.edit=true" WizardClassName="%Default%" - displayName="Rename..." kind="action" name="Rename"> - <EntityData EntityName="FileXSL"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="SaveActions"> - <XActionItem HIDE="always" HandlerClassName="%SaveFile%" - ICON="action.save" displayName="Save" kind="action" name="Save"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem kind="list" name="DiscardActions"> - <XActionItem HIDE="always" - HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler" - ICON="action.delete" - PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" - displayName="Discard Changes" kind="action" name="Discard"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> <XModelEntity name="NewFileWizard"> <XChildrenEntities/> <XEntityRenderer/> @@ -628,18 +292,6 @@ <XActionItem kind="list"/> <XDependencies/> </XModelEntity> - <XModelEntity name="NewJSPFileWizardTaglibs"> - <XChildrenEntities/> - <XEntityRenderer/> - <XModelAttributes> - <XModelAttribute name="taglibs"> - <Constraint loader="ListAdd"/> - <Editor name="ListAdd"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"/> - <XDependencies/> - </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.common.model.impl.PropertyObjectImpl" name="Property"> <XChildrenEntities/> @@ -714,12 +366,8 @@ <XEntityExtension name="FileFolder"> <XChildrenEntities> <XChildEntity name="FileTXT"/> - <XChildEntity name="FileJSP"/> - <XChildEntity name="FileXSL"/> - <XChildEntity name="FileHTML"/> <XChildEntity name="FilePROPERTIES"/> <XChildEntity name="FileGIF"/> - <XChildEntity name="FileXHTML"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -743,12 +391,8 @@ <XEntityExtension name="FileSystemFolder"> <XChildrenEntities> <XChildEntity name="FileTXT"/> - <XChildEntity name="FileJSP"/> - <XChildEntity name="FileHTML"/> - <XChildEntity name="FileXSL"/> <XChildEntity name="FilePROPERTIES"/> <XChildEntity name="FileGIF"/> - <XChildEntity name="FileXHTML"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> @@ -761,12 +405,8 @@ <XEntityExtension name="FileSystemJar"> <XChildrenEntities> <XChildEntity name="FileTXT"/> - <XChildEntity name="FileJSP"/> - <XChildEntity name="FileHTML"/> - <XChildEntity name="FileXSL"/> <XChildEntity name="FilePROPERTIES"/> <XChildEntity name="FileGIF"/> - <XChildEntity name="FileXHTML"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> @@ -779,12 +419,8 @@ <XEntityExtension name="JarFolder"> <XChildrenEntities> <XChildEntity name="FileTXT"/> - <XChildEntity name="FileJSP"/> - <XChildEntity name="FileXSL"/> - <XChildEntity name="FileHTML"/> <XChildEntity name="FilePROPERTIES"/> <XChildEntity name="FileGIF"/> - <XChildEntity name="FileXHTML"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesystems.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesystems.meta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesystems.meta 2009-09-18 09:15:20 UTC (rev 17648) @@ -13,14 +13,9 @@ <MAPPING name="Recognizers"> <PAIR name="class$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> <PAIR name="gif$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="htm$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="html$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> <PAIR name="java$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="jsf$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> <PAIR name="properties$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> <PAIR name="txt$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="xhtml$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> - <PAIR name="xsl$5" value="org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer"/> </MAPPING> </MAPPINGS> <ICONS/> Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/MappedEntityRecognizer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/MappedEntityRecognizer.java 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/MappedEntityRecognizer.java 2009-09-18 09:15:20 UTC (rev 17648) @@ -11,18 +11,25 @@ package org.jboss.tools.common.model.loaders.impl; import java.util.*; + +import org.jboss.tools.common.meta.XMapping; +import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; import org.jboss.tools.common.model.loaders.*; public class MappedEntityRecognizer implements EntityRecognizer { + static String MAPPED_ENTITIES = "MappedEntities"; //$NON-NLS-1$ private Map<String,String> map = new HashMap<String,String>(); public MappedEntityRecognizer() { - map.put("bpf", "FileProcess"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("htm", "FileHTML"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("flow", "FileFlow"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jspx", "FileJSP"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jspf", "FileJSP"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jsf", "FileHTML"); //$NON-NLS-1$ //$NON-NLS-2$ + XMapping m = XModelMetaDataImpl.getInstance().getMapping(MAPPED_ENTITIES); + if(m != null) { + String[] ks = m.getKeys(); + for (int i = 0; i < ks.length; i++) { + String extension = ks[i]; + String entity = m.getValue(extension); + map.put(extension, entity); + } + } } // NB i18n: there is code that depends on these entity names (in English)

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17647 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-18 04:09:32 -0400 (Fri, 18 Sep 2009) New Revision: 17647 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/jsp/model/ Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Deprecated implementation FileJSPImpl removed. Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18 07:57:39 UTC (rev 17646) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18 08:09:32 UTC (rev 17647) @@ -82,8 +82,6 @@ <extension point="org.jboss.tools.common.model.classes"> <xclass id="org.jboss.tools.common.ant.model.AntEntityRecognizer" class="org.jboss.tools.common.ant.model.AntEntityRecognizer"/> - <xclass id="org.jboss.tools.common.java.jsp.model.FileJSPImpl" - class="org.jboss.tools.common.java.jsp.model.FileJSPImpl"/> <xclass id="org.jboss.tools.common.java.model.handler.CreateJavaFileHandler" class="org.jboss.tools.common.java.model.handler.CreateJavaFileHandler"/> <xclass id="org.jboss.tools.common.meta.action.impl.handlers.ChildrenCopyHandler" Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2009-09-18 07:57:39 UTC (rev 17646) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2009-09-18 08:09:32 UTC (rev 17647) @@ -183,7 +183,7 @@ <XModelEntity AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" - ImplementingClass="org.jboss.tools.common.java.jsp.model.FileJSPImpl" + ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%JSP%" name="FileJSP"> <XChildrenEntities/> <XEntityRenderer>

14 years, 9 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2009-09-18 03:57:39 -0400 (Fri, 18 Sep 2009) New Revision: 17646 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java Log: JBIDE-4911: NPE occurres while invoking the CA in an empty editor Issue is fixed 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-09-18 00:00:41 UTC (rev 17645) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-09-18 07:57:39 UTC (rev 17646) @@ -379,6 +379,7 @@ */ @Override protected String getMatchString(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) { + if (aRegion == null) return ""; String matchString = super.getMatchString(parent, aRegion, offset); String regionType = aRegion.getType(); if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.startsWith("\"")) { //$NON-NLS-1$

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17645 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-09-17 20:00:41 -0400 (Thu, 17 Sep 2009) New Revision: 17645 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml Log: Pushing even more forward with extensions for ESB project structure Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java 2009-09-17 22:59:17 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -1,69 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.core.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualResource; - -public class LimitedContainerVirtualFolder extends VirtualFolder { - - private IContainer[] containers; - public LimitedContainerVirtualFolder( - IProject aComponentProject, - IPath aRuntimePath, - IContainer[] containers) { - super(aComponentProject, aRuntimePath); - this.containers = containers; - } - - public IContainer getUnderlyingFolder() { - if( containers != null && containers.length > 0 - && containers[0] != null ) - return containers[0]; - return null; - } - - public IContainer[] getUnderlyingFolders() { - return containers == null ? new IContainer[]{} : containers; - } - - public IVirtualResource[] members(int memberFlags) throws CoreException { - List<IVirtualResource> virtualResources = new ArrayList<IVirtualResource>(); // result - Set allNames = new HashSet(); - - for( int i = 0; i < containers.length; i++ ) { - IResource realResource = containers[i]; - if ((realResource != null) && (realResource.getType() == IResource.FOLDER || realResource.getType() == IResource.PROJECT)) { - IContainer realContainer = (IContainer) realResource; - IResource[] realChildResources = realContainer.members(memberFlags); - for (int realResourceIndex = 0; realResourceIndex < realChildResources.length; realResourceIndex++) { - IResource child = realChildResources[realResourceIndex]; - String localName = child.getName(); - if (allNames.add(localName)) { - IPath newRuntimePath = getRuntimePath().append(localName); - if (child instanceof IFile) { - virtualResources.add(new VirtualFile(getProject(), newRuntimePath, (IFile) child)); - } else { - virtualResources.add(ComponentCore.createFolder(getProject(), newRuntimePath)); - } - } - } - } - // An IResource.FILE would be an error condition (as this is a container) - } - return virtualResources.toArray(new IVirtualResource[virtualResources.size()]); - } - - -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java (from rev 17524, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,96 @@ +package org.jboss.ide.eclipse.as.wtp.core.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder; +import org.eclipse.wst.common.componentcore.resources.IVirtualResource; + +public class ResourceListVirtualFolder extends VirtualFolder { + + private ArrayList<IResource> resources; + public ResourceListVirtualFolder( + IProject aComponentProject, + IPath aRuntimePath, + IResource[] containers) { + super(aComponentProject, aRuntimePath); + this.resources = new ArrayList<IResource>(); + this.resources.addAll(Arrays.asList(containers)); + } + + protected void addResource(IResource c) { + //this.resources.add(c); + } + + public IResource getUnderlyingResource() { + // Since I'm a container, pretend I'm a container I guess + return getUnderlyingFolder(); + } + + public IResource[] getUnderlyingResources() { + return getUnderlyingFolders(); + } + + public IContainer getUnderlyingFolder() { + IResource[] r = (IResource[]) resources.toArray(new IResource[resources.size()]); + for( int i = 0; i < r.length; i++ ) + if( r[i] instanceof IContainer ) + return (IContainer)r[i]; + return null; + } + + public IContainer[] getUnderlyingFolders() { + IResource[] r = (IResource[]) resources.toArray(new IResource[resources.size()]); + ArrayList<IContainer> c = new ArrayList<IContainer>(); + for( int i = 0; i < r.length; i++ ) + if( r[i] instanceof IContainer ) + c.add((IContainer)r[i]); + return (IContainer[]) c.toArray(new IContainer[c.size()]); + } + + public IVirtualResource[] members(int memberFlags) throws CoreException { + List<IVirtualResource> virtualResources = new ArrayList<IVirtualResource>(); // result + Set allNames = new HashSet(); + IResource[] containers2 = (IResource[]) this.resources.toArray(new IResource[this.resources.size()]); + for( int i = 0; i < containers2.length; i++ ) { + IResource realResource = containers2[i]; + if ((realResource != null) && (realResource.getType() == IResource.FOLDER || realResource.getType() == IResource.PROJECT)) { + IContainer realContainer = (IContainer) realResource; + IResource[] realChildResources = realContainer.members(memberFlags); + for (int realResourceIndex = 0; realResourceIndex < realChildResources.length; realResourceIndex++) { + IResource child = realChildResources[realResourceIndex]; + String localName = child.getName(); + if (allNames.add(localName)) { + IPath newRuntimePath = getRuntimePath().append(localName); + if (child instanceof IFile) { + virtualResources.add(new VirtualFile(getProject(), newRuntimePath, (IFile) child)); + } else if( child instanceof IContainer ){ + IContainer childContainer = (IContainer)child; + IResource[] members = childContainer.members(); + ResourceListVirtualFolder childFolder = + new ResourceListVirtualFolder(getProject(), newRuntimePath, members); + virtualResources.add(childFolder); + } + } + } + } else if(realResource != null && realResource instanceof IFile) { + // An IResource.FILE would be an error condition (as this is a container) + virtualResources.add(new VirtualFile(getProject(), + getRuntimePath().append(((IFile)realResource).getName()), (IFile)realResource)); + } + } + return virtualResources.toArray(new IVirtualResource[virtualResources.size()]); + } + + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,68 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import org.eclipse.core.internal.resources.Workspace; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.emf.common.util.URI; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage; +import org.eclipse.wst.common.componentcore.internal.DependencyType; +import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; +import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; + +public class ExportedClassFolderReferenceResolver implements IReferenceResolver { + public static final String OUTPUT_FOLDER_SEGMENT = "org.jboss.ide.eclipse.as.wtp.core.vcf.exportedClassFolders"; + public static final String OUTPUT_FOLDER_PROTOCOL = PlatformURLModuleConnection.MODULE_PROTOCOL + +IPath.SEPARATOR+ OUTPUT_FOLDER_SEGMENT + IPath.SEPARATOR; + public ExportedClassFolderReferenceResolver() { + } + + public boolean canResolve(IVirtualComponent context, + ReferencedComponent referencedComponent) { + URI handle = referencedComponent.getHandle(); + String s = handle.toString(); + if(s.startsWith(OUTPUT_FOLDER_PROTOCOL)) + return true; + return false; + } + + public boolean canResolve(IVirtualReference reference) { + if( reference.getReferencedComponent() instanceof ExportedClasspathFoldersVirtualComponent ) + return true; + return false; + } + + public IVirtualReference resolve(IVirtualComponent context, + ReferencedComponent referencedComponent) { + String project = referencedComponent.getHandle().segment(1); + IProject p = null; + if( !project.equals("")) + p = ResourcesPlugin.getWorkspace().getRoot().getProject(project); + else + p = context.getProject(); + IVirtualComponent comp = new ExportedClasspathFoldersVirtualComponent(p, context); + IVirtualReference ref = ComponentCore.createReference(context, comp); + ref.setArchiveName(referencedComponent.getArchiveName()); + ref.setRuntimePath(referencedComponent.getRuntimePath()); + ref.setDependencyType(referencedComponent.getDependencyType().getValue()); + return ref; + } + + public ReferencedComponent resolve(IVirtualReference reference) { + if( reference.getReferencedComponent() instanceof ExportedClasspathFoldersVirtualComponent ) { + ExportedClasspathFoldersVirtualComponent comp = (ExportedClasspathFoldersVirtualComponent)reference.getReferencedComponent(); + IProject p = reference.getReferencedComponent().getProject(); + ReferencedComponent rc = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent(); + rc.setArchiveName(reference.getArchiveName()); + rc.setRuntimePath(reference.getRuntimePath()); + rc.setHandle(URI.createURI(comp.getId())); + rc.setDependencyType(DependencyType.CONSUMES_LITERAL); + return rc; + } + return null; + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,59 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IClasspathAttribute; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; + +public class ExportedClasspathFoldersVirtualComponent extends FilesetVirtualComponent { + public ExportedClasspathFoldersVirtualComponent(IProject p, IVirtualComponent referencingComponent) { + super(p,referencingComponent); + } + + protected String getFirstIdSegment() { + return ExportedClassFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; + } + + protected IResource[] getExposableResources() { + IJavaProject jp = JavaCore.create(project); + IClasspathEntry[] entries = findAllClassFolderEntries(jp); + ArrayList<IResource> results = new ArrayList<IResource>(); + for( int i = 0; i < entries.length; i++ ) { + IClasspathAttribute attribute = ClasspathDependencyUtil.checkForComponentDependencyAttribute( + entries[i], + ClasspathDependencyUtil.DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY); + + if( attribute != null ) { + final IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(entries[i].getPath()); + if (resource != null && resource instanceof IContainer ) { + results.add(resource); + } + } + } + return (IResource[]) results.toArray(new IResource[results.size()]); + } + + protected IClasspathEntry[] findAllClassFolderEntries(IJavaProject javaProject) { + List<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); + try { + IClasspathEntry[] entries = javaProject.getRawClasspath(); + for( int i = 0; i < entries.length; i++ ) { + if( ClasspathDependencyUtil.isClassFolderEntry(entries[i])) + list.add(entries[i]); + } + } catch( CoreException ce) { + } + return list.toArray(new IClasspathEntry[list.size()]); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,120 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import java.util.Properties; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.jboss.ide.eclipse.as.wtp.core.util.ResourceListVirtualFolder; + +public abstract class FilesetVirtualComponent implements IVirtualComponent { + protected IProject project; + protected IVirtualComponent referencingComp; + + public FilesetVirtualComponent(IProject p, IVirtualComponent referencingComponent) { + this.project = p; + this.referencingComp = referencingComponent; + } + + public void create(int updateFlags, IProgressMonitor aMonitor) + throws CoreException { + // Ignore + } + + public boolean exists() { + return true; + } + + public IVirtualComponent getComponent() { + return this; + } + + public String getName() { + return getId(); + } + + public String getDeployedName() { + return getName(); + } + + protected String getId() { + String firstSegment = getFirstIdSegment(); + if (project.equals(referencingComp.getProject())) + return firstSegment; + + return firstSegment + Path.SEPARATOR + project.getName(); + } + + protected abstract String getFirstIdSegment(); + + public IProject getProject() { + return project; + } + + public IVirtualComponent[] getReferencingComponents() { + return referencingComp == null ? new IVirtualComponent[] {} + : new IVirtualComponent[] { referencingComp }; + } + + public IVirtualFolder getRootFolder() { + IResource[] resources = getExposableResources(); + return new ResourceListVirtualFolder( + project, new Path("/"), resources); + } + + protected abstract IResource[] getExposableResources(); + + public Properties getMetaProperties() { + return null; + } + + public IPath[] getMetaResources() { + return null; + } + + public IVirtualReference getReference(String aComponentName) { + // Ignore + return null; + } + + public IVirtualReference[] getReferences() { + // Ignore; no children + return new IVirtualReference[] {}; + } + + public boolean isBinary() { + return false; + } + + public void setMetaProperties(Properties properties) { + // Ignore + } + + public void setMetaProperty(String name, String value) { + // Ignore + } + + public void setMetaResources(IPath[] theMetaResourcePaths) { + // Ignore + } + + public void setReferences(IVirtualReference[] theReferences) { + // Ignore + } + + public Object getAdapter(Class adapter) { + // Ignore + return null; + } + + public void addReferences(IVirtualReference[] references) { + // Ignore + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-17 22:59:17 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -2,74 +2,28 @@ import java.util.ArrayList; import java.util.List; -import java.util.Properties; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; +import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.jboss.ide.eclipse.as.wtp.core.util.LimitedContainerVirtualFolder; -public class OutputFoldersVirtualComponent implements IVirtualComponent { +public class OutputFoldersVirtualComponent extends FilesetVirtualComponent { - private IProject project; - private IVirtualComponent referencingComp; - public OutputFoldersVirtualComponent(IProject p, IVirtualComponent referencingComponent) { - this.project = p; - this.referencingComp = referencingComponent; + super(p, referencingComponent); } - public void create(int updateFlags, IProgressMonitor aMonitor) - throws CoreException { - // Ignore + protected String getFirstIdSegment() { + return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; } - public boolean exists() { - return true; - } - - public IVirtualComponent getComponent() { - return this; - } - - public String getName() { - return getId(); - } - - public String getDeployedName() { - return getName(); - } - - protected String getId() { - if( project.equals(referencingComp.getProject())) - return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; - return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL + Path.SEPARATOR + project.getName(); - } - - public IProject getProject() { - return project; - } - public IVirtualComponent[] getReferencingComponents() { - return referencingComp == null ? new IVirtualComponent[]{} : new IVirtualComponent[]{referencingComp}; - } - - public IVirtualFolder getRootFolder() { - IContainer[] containers = getOutputContainers(project); - return new LimitedContainerVirtualFolder(project, new Path("/"), containers); - } - - private static IContainer[] getOutputContainers(IProject project) { + protected IResource[] getExposableResources() { List<IContainer> result = new ArrayList<IContainer>(); try { if (!project.hasNature(JavaCore.NATURE_ID)) @@ -102,55 +56,4 @@ } return list.toArray(new IPackageFragmentRoot[list.size()]); } - - - public Properties getMetaProperties() { - // TODO Auto-generated method stub - return null; - } - - public IPath[] getMetaResources() { - // TODO Auto-generated method stub - return null; - } - - public IVirtualReference getReference(String aComponentName) { - // Ignore - return null; - } - - public IVirtualReference[] getReferences() { - // Ignore; no children - return new IVirtualReference[]{}; - } - - public boolean isBinary() { - return false; - } - - public void setMetaProperties(Properties properties) { - // Ignore - } - - public void setMetaProperty(String name, String value) { - // Ignore - } - - public void setMetaResources(IPath[] theMetaResourcePaths) { - // Ignore - } - - public void setReferences(IVirtualReference[] theReferences) { - // Ignore - } - - public Object getAdapter(Class adapter) { - // Ignore - return null; - } - - public void addReferences(IVirtualReference[] references) { - // Ignore - } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-17 22:59:17 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-18 00:00:41 UTC (rev 17645) @@ -58,8 +58,14 @@ <referenceFragment class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.OutputFolderReferenceWizardFragment" icon="icons/jar_obj.gif" - id="org.jboss.ide.eclipse.as.wtp.ui.mappedOutputFolders" + id="org.jboss.ide.eclipse.as.wtp.ui.mappedOutputFoldersReference" name="Mapped Output Folders"> </referenceFragment> + <referenceFragment + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ExportedClasspathFoldersReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.jboss.ide.eclipse.as.wtp.ui.ExportedClasspathFoldersReference" + name="Build Path Class Folders"> + </referenceFragment> </extension> </plugin> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,212 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathAttribute; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; +import org.eclipse.jst.j2ee.internal.classpathdep.UpdateClasspathAttributesDataModelProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.SharedImages; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.core.vcf.ExportedClasspathFoldersVirtualComponent; + +public class ExportedClasspathFoldersReferenceWizardFragment extends + WizardFragment { + + protected TreeViewer viewer; + protected IPath[] paths; + protected IWizardHandle handle; + protected IStructuredSelection selected = null; + protected IStructuredSelection initialSelection = null; + protected Object[] allElements; + public ExportedClasspathFoldersReferenceWizardFragment() { + super(); + } + + public boolean hasComposite() { + return true; + } + + public Composite createComposite(Composite parent, IWizardHandle handle) { + this.handle = handle; + int x = 1; + handle.setTitle("Add exported folders from the build pathx"); + handle.setDescription("This reference will allow you to add references to exported classpaths from this project's build page. Please select all entries you wish to be published."); + IVirtualComponent parentComp = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + IProject project = parentComp.getProject(); + IJavaProject javaProject = JavaCore.create(project); + allElements = findAllClassFolderEntries(javaProject); + + Composite c = new Composite(parent, SWT.NONE); + c.setLayout(new FormLayout()); + viewer = new TreeViewer(c, SWT.MULTI | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.setInput(ResourcesPlugin.getWorkspace()); + + FormData fd = new FormData(); + fd.left = new FormAttachment(0, 5); + fd.top = new FormAttachment(0, 5); + fd.right = new FormAttachment(100, -5); + fd.bottom = new FormAttachment(100, -5); + viewer.getTree().setLayoutData(fd); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + selected = (IStructuredSelection)viewer.getSelection(); + } + }); + + ArrayList<IClasspathEntry> withTag = new ArrayList<IClasspathEntry>(); + for( int i = 0; i < allElements.length; i++ ) { + IClasspathAttribute attribute = ClasspathDependencyUtil.checkForComponentDependencyAttribute( + ((IClasspathEntry)allElements[i]), + ClasspathDependencyUtil.DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY); + + if( attribute != null ) + withTag.add((IClasspathEntry)allElements[i]); + } + + StructuredSelection newSel = new StructuredSelection(withTag); + viewer.setSelection(newSel); + initialSelection = newSel; + return c; + } + + protected IClasspathEntry[] findAllClassFolderEntries(IJavaProject javaProject) { + List<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); + try { + IClasspathEntry[] entries = javaProject.getRawClasspath(); + for( int i = 0; i < entries.length; i++ ) { + if( ClasspathDependencyUtil.isClassFolderEntry(entries[i])) + list.add(entries[i]); + } + } catch( CoreException ce) { + } + return list.toArray(new IClasspathEntry[list.size()]); + } + + private ITreeContentProvider getContentProvider() { + return new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + IVirtualComponent parentComp = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + IProject project = parentComp.getProject(); + IJavaProject jp = JavaCore.create(project); + if( jp != null ) { + return findAllClassFolderEntries(jp); + } + return new Object[]{}; + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + + private LabelProvider getLabelProvider() { + return new LabelProvider() { + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(SharedImages.IMG_OBJ_PROJECT); + } + public String getText(Object element) { + return element instanceof IProject ? ((IProject)element).getName() : element.toString(); + } + }; + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent parentComp = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + try { + Map<IClasspathEntry, IPath> toAdd = new HashMap<IClasspathEntry, IPath>(); + Map<IClasspathEntry, IPath> toRemove = new HashMap<IClasspathEntry, IPath>(); + + List pre = Arrays.asList(initialSelection.toArray()); + List post = Arrays.asList(selected.toArray()); + for( int i = 0; i < allElements.length; i++ ) { + if( pre.contains(allElements[i]) && !post.contains(allElements[i])) { + toRemove.put((IClasspathEntry)allElements[i], getOriginalPath((IClasspathEntry)allElements[i])); + } + else if( !pre.contains(allElements[i]) && post.contains(allElements[i])) { + toAdd.put((IClasspathEntry)allElements[i], getNewPath((IClasspathEntry)allElements[i])); + } + } + + UpdateClasspathAttributesDataModelProvider provider = new UpdateClasspathAttributesDataModelProvider(); + IDataModel model = DataModelFactory.createDataModel(provider); + model.setProperty(UpdateClasspathAttributesDataModelProvider.PROJECT_NAME, parentComp.getProject().getName()); + model.setProperty(UpdateClasspathAttributesDataModelProvider.ENTRIES_TO_ADD_ATTRIBUTE, toAdd); + model.getDefaultOperation().execute(new NullProgressMonitor(), null); + + provider = new UpdateClasspathAttributesDataModelProvider(); + model = DataModelFactory.createDataModel(provider); + model.setProperty(UpdateClasspathAttributesDataModelProvider.PROJECT_NAME, parentComp.getProject().getName()); + model.setProperty(UpdateClasspathAttributesDataModelProvider.ENTRIES_TO_REMOVE_ATTRIBUTE, toRemove); + model.getDefaultOperation().execute(new NullProgressMonitor(), null); + + } catch( ExecutionException ee) { + + } + + ExportedClasspathFoldersVirtualComponent vc = new ExportedClasspathFoldersVirtualComponent(parentComp.getProject(), parentComp); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, vc); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, "/"); + } + + protected IPath getOriginalPath(IClasspathEntry entry) { + final IClasspathAttribute[] attributes = entry.getExtraAttributes(); + for (int i = 0; i < attributes.length; i++) { + final IClasspathAttribute attribute = attributes[i]; + final String name = attribute.getName(); + if (name.equals(ClasspathDependencyUtil.CLASSPATH_COMPONENT_DEPENDENCY)) { + return new Path(attribute.getValue()); + } + } + return new Path("/"); + } + + protected IPath getNewPath(IClasspathEntry cpe) { + return new Path("/"); + } +}

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r17644 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-09-17 18:59:17 -0400 (Thu, 17 Sep 2009) New Revision: 17644 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java Log: https://bugs.eclipse.org/bugs/show_bug.cgi?id=289802 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09-17 22:40:05 UTC (rev 17643) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09-17 22:59:17 UTC (rev 17644) @@ -548,9 +548,12 @@ IVirtualComponent comp; for( int i = 0; i < refs.length; i++ ) { comp = refs[i].getReferencedComponent(); - String val = refs[i].getRuntimePath().append(refs[i].getArchiveName()).toString(); - objectToRuntimePath.put(comp, val); - oldComponentToRuntimePath.put((IVirtualComponent) comp, val); + IPath val = refs[i].getRuntimePath(); + if( refs[i].getDependencyType() != IVirtualReference.DEPENDENCY_TYPE_CONSUMES) + val = val.append(refs[i].getArchiveName()); + + objectToRuntimePath.put(comp, val.toString()); + oldComponentToRuntimePath.put((IVirtualComponent) comp, val.toString()); } ComponentResource[] allMappings = findAllMappings();

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2009