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)