JBoss Tools SVN: r17592 - trunk/struts/plugins/org.jboss.tools.struts/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 11:12:06 -0400 (Tue, 15 Sep 2009)
New Revision: 17592
Added:
trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties
Modified:
trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Extension point added and eclipse options split between common and jst
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-15 15:11:23 UTC (rev 17591)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.properties 2009-09-15 15:12:06 UTC (rev 17592)
@@ -938,3 +938,88 @@
SharableStrutsEditor.showShortcutIcon=Show shortcut icon
SharableStrutsEditor.showShortcutPath=Show shortcut path
SharableStrutsEditor.Show_Grid=Show grid
+
+SharableStruts10Support.servlet_class=Servlet Class
+SharableStruts10Support.url_pattern=URL Pattern
+SharableStruts10Support.tld_files=TLD Files
+SharableStruts11Support.servlet_class=Servlet Class
+SharableStruts11Support.url_pattern=URL Pattern
+SharableStruts11Support.tld_files=TLD Files
+
+SharableStrutsEditor.doNotShowDiagram=Do not show diagram tab
+
+# New Struts Project wizard
+NEW_STRUTS_PROJECT_WIZARD_WINDOW_TITLE = New Struts Project
+NEW_STRUTS_PROJECT_WIZARD_CREATE_STRUTS_PROJECT = Create Struts Project
+
+newStrutsProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in JBoss Tools.
+newStrutsProjectPage1_name = Project Name
+newStrutsProjectPage1_location = Location
+newStrutsProjectPage1_use_default_path = Use default path
+newStrutsProjectPage1_version = Struts Environment
+newStrutsProjectPage1_template = Template
+WebPrjCreateStepDirs_servletVersion=Servlet Version
+
+newStrutsProjectPage1_specifyProjectName = Specify Project Name
+newStrutsProjectPage1_specifyLocation = Specify location
+newStrutsProjectPage1_locationError = Location Error
+newStrutsProjectPage1_projectExistsMessage = Project already exists
+# Errors
+NewStrutsProjectWizard.CannotCreateLocation.WindowTitle = Error
+NewStrutsProjectWizard.CannotCreateLocation.ErrorMessage = Cannot create specify location
+
+# New Eclipse4Web Struts Project wizard
+newStrutsLightProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in Eclipse4Web.
+newStrutsLightProjectPage1_name = Project Name
+newStrutsLightProjectPage1_location = Location
+newStrutsLightProjectPage1_use_default_path = Use default path
+newStrutsLightProjectPage1_version = Struts Environment
+newStrutsLightProjectPage1_template = Template
+
+newStrutsLightProjectPage1_specifyProjectName = Specify Project Name
+newStrutsLightProjectPage1_specifyLocation = Specify location
+newStrutsLightProjectPage1_locationError = Location Error
+newStrutsLightProjectPage1_projectExistsMessage = Project already exists
+
+# Import Struts Project wizard
+IMPORT_STRUTS_PROJECT_WIZARD_WINDOW_TITLE = Import Struts Project
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_LOCATION = Project Location
+IMPORT_STRUTS_PROJECT_SELECT_WEB_XML = Please select web.xml location
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_MODULES = Project Modules
+IMPORT_STRUTS_PROJECT_CONFIGURE_PROJECT_MODULES = Configure Project Modules
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_FOLDERS = Project Folders
+IMPORT_STRUTS_PROJECT_SELECT_PROJECT_FOLDERS = Select Project Folders
+
+ADD_STRUTS_NATURE = Add Struts Capabilities
+
+org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard.mainPageTitle=Struts project
+
+IMPORT_STRUTS_PROJECT_EARLIER_VERSION_WARNING=This project has been created in an earlier version of Struts Studio. Select Yes if you want import and convert this project to the current version. Once this project is converted you will not be able to open it in a previous version. Select No if you want to cancel project import and leave it as it is.
+
+#Wizard-Labels.begin
+
+# Generate java code - step 1
+StrutsGen11_Start_actions = Generate classes for Actions
+StrutsGen11_Start_formbeans = Generate classes for FormBeans
+StrutsGen11_Start_forwards = Generate classes for Forwards
+StrutsGen11_Start_exceptions = Generate classes for Exceptions
+StrutsGen11_Start_overwrite = Overwrite existing files
+StrutsGen11_Start_base_package = Base package
+# Generate java code - step 2
+StrutsGen11_Actions_base_class = Base class
+StrutsGen11_Actions_properties = Generate JavaBeans properties
+StrutsGen11_Actions_global_forwards = Generate constraints for global forwards
+StrutsGen11_Actions_local_forwards = Generate constraints for local forwards
+# Generate java code - step 3
+StrutsGen11_FormBeans_base_class = Base class
+StrutsGen11_FormBeans_properties = Generate JavaBeans properties
+# Generate java code - step 4
+StrutsGen11_Forwards_base_class = Base class
+StrutsGen11_Forwards_properties = Generate JavaBeans properties
+# Generate java code - step 5
+StrutsGen11_Exceptions_base_class = Base class
+StrutsGen11_Exceptions_properties = Generate JavaBeans properties
+
+#Wizard-Labels.end
+
+
Added: 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 (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties 2009-09-15 15:12:06 UTC (rev 17592)
@@ -0,0 +1,61 @@
+SharableStruts10Support.servlet_class=\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8\u30FB\u30AF\u30E9\u30B9
+SharableStruts10Support.url_pattern=URL \u30D1\u30BF\u30FC\u30F3
+SharableStruts10Support.tld_files=TLD \u30D5\u30A1\u30A4\u30EB
+SharableStruts11Support.servlet_class=\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8\u30FB\u30AF\u30E9\u30B9
+SharableStruts11Support.url_pattern=URL \u30D1\u30BF\u30FC\u30F3
+SharableStruts11Support.tld_files=TLD \u30D5\u30A1\u30A4\u30EB
+
+SharableStrutsEditor.doNotShowDiagram=\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0\u30FB\u30BF\u30D6\u3092\u8868\u793A\u3057\u306A\u3044
+
+NEW_STRUTS_PROJECT_WIZARD_WINDOW_TITLE=\u65B0\u898F Struts \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+NEW_STRUTS_PROJECT_WIZARD_CREATE_STRUTS_PROJECT=Struts \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
+newStrutsProjectPage1_introduction=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+newStrutsProjectPage1_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D
+newStrutsProjectPage1_location=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+newStrutsProjectPage1_use_default_path=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30D1\u30B9\u3092\u4F7F\u7528
+newStrutsProjectPage1_version=Struts \u74B0\u5883
+newStrutsProjectPage1_template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+WebPrjCreateStepDirs_servletVersion=\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3
+newStrutsProjectPage1_specifyProjectName=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u6307\u5B9A
+newStrutsProjectPage1_specifyLocation=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+newStrutsProjectPage1_locationError=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30E9\u30FC
+newStrutsProjectPage1_projectExistsMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+NewStrutsProjectWizard.CannotCreateLocation.WindowTitle=\u30A8\u30E9\u30FC
+NewStrutsProjectWizard.CannotCreateLocation.ErrorMessage=\u6307\u5B9A\u3055\u308C\u305F\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+newStrutsLightProjectPage1_introduction=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+newStrutsLightProjectPage1_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D
+newStrutsLightProjectPage1_location=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+newStrutsLightProjectPage1_use_default_path=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30D1\u30B9\u3092\u4F7F\u7528
+newStrutsLightProjectPage1_version=Struts \u74B0\u5883
+newStrutsLightProjectPage1_template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+newStrutsLightProjectPage1_specifyProjectName=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u6307\u5B9A
+newStrutsLightProjectPage1_specifyLocation=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+newStrutsLightProjectPage1_locationError=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30E9\u30FC
+newStrutsLightProjectPage1_projectExistsMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+IMPORT_STRUTS_PROJECT_WIZARD_WINDOW_TITLE=Struts \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_LOCATION=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+IMPORT_STRUTS_PROJECT_SELECT_WEB_XML=web.xml \u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_MODULES=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
+IMPORT_STRUTS_PROJECT_CONFIGURE_PROJECT_MODULES=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u69CB\u6210
+IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_FOLDERS=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC
+IMPORT_STRUTS_PROJECT_SELECT_PROJECT_FOLDERS=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u9078\u629E
+ADD_STRUTS_NATURE=Struts \u6A5F\u80FD\u306E\u8FFD\u52A0
+org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard.mainPageTitle=Struts \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+IMPORT_STRUTS_PROJECT_EARLIER_VERSION_WARNING=This project has been created in an earlier version of Struts Studio. Select Yes if you want import and convert this project to the current version. Once this project is converted you will not be able to open it in a previous version. Select No if you want to cancel project import and leave it as it is.
+
+StrutsGen11_Start_actions=Generate classes for Actions
+StrutsGen11_Start_formbeans=Generate classes for FormBeans
+StrutsGen11_Start_forwards=Generate classes for Forwards
+StrutsGen11_Start_exceptions=Generate classes for Exceptions
+StrutsGen11_Start_overwrite=\u65E2\u5B58\u30D5\u30A1\u30A4\u30EB\u306E\u4E0A\u66F8\u304D
+StrutsGen11_Start_base_package=Base package
+StrutsGen11_Actions_base_class=\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9
+StrutsGen11_Actions_properties=Generate JavaBeans properties
+StrutsGen11_Actions_global_forwards=Generate constraints for global forwards
+StrutsGen11_Actions_local_forwards=Generate constraints for local forwards
+StrutsGen11_FormBeans_base_class=\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9
+StrutsGen11_FormBeans_properties=Generate JavaBeans properties
+StrutsGen11_Forwards_base_class=\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9
+StrutsGen11_Forwards_properties=Generate JavaBeans properties
+StrutsGen11_Exceptions_base_class=\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9
+StrutsGen11_Exceptions_properties=Generate JavaBeans properties
Property changes on: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_ja.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r17591 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/help and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 11:11:23 -0400 (Tue, 15 Sep 2009)
New Revision: 17591
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Extension point added and eclipse options splitted between common and jst
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2009-09-15 15:10:31 UTC (rev 17590)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2009-09-15 15:11:23 UTC (rev 17591)
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<XStudio model-entity="SharableXStudio" NAME="XStudio" SCOPE="project">
<Options model-entity="SharableOptions" NAME="Options" SCOPE="project">
+ <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project"
+ selectSourceTab="no" tabWidth="4" useRedHatEditors="yes">
+ <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
+ SCOPE="project" action_font="default,size=8,style=1"
+ forward_font="default,size=7,style=1" grid_step="16"
+ path_font="default,size=8,style=1" removePageWithFile="yes" show_grid="yes"/>
+ </Editors>
<StrutsStudio model-entity="SharableStrutsStudio" NAME="Struts Studio" SCOPE="project">
<Verification model-entity="SharableVerification" NAME="Verification"
SCOPE="project" error_number_limit="unlimited"/>
@@ -68,13 +75,6 @@
NAME="Default Error Messages" SCOPE="project" text="errors.required={0} is required.\n\nerrors.minlength={0} can not be less than {1} characters.\nerrors.maxlength={0} can not be greater than {1} characters.\nerrors.invalid={0} is invalid.\n \nerrors.byte={0} must be a byte.\nerrors.short={0} must be a short.\nerrors.integer={0} must be an integer.\nerrors.long={0} must be a long.\nerrors.float={0} must be a float.\nerrors.double={0} must be a double.\n \nerrors.date={0} is not a date.\nerrors.range={0} is not in the range {1} through {2}.\nerrors.creditcard={0} is an invalid credit card number.\nerrors.email={0} is an invalid e-mail address.\n"/>
</ResourcesInsets>
</Automation>
- <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project"
- selectSourceTab="no" tabWidth="4" useRedHatEditors="yes">
- <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
- SCOPE="project" action_font="default,size=8,style=1"
- forward_font="default,size=7,style=1" grid_step="16"
- path_font="default,size=8,style=1" removePageWithFile="yes" show_grid="yes"/>
- </Editors>
</StrutsStudio>
</Options>
</XStudio>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2009-09-15 15:10:31 UTC (rev 17590)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2009-09-15 15:11:23 UTC (rev 17591)
@@ -661,3 +661,43 @@
FaceletTaglibConverter_Properties.Title=Facelet Converter
FaceletTaglibValidator_Properties.Title=Facelet Validator
FaceletTaglibSource_Properties.Title=Facelet Tag Source
+
+# New Eclipse4Web JSF Project wizard
+newJSFLightProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in Eclipse4Web.
+newJSFLightProjectPage1_name = Project Name
+newJSFLightProjectPage1_location = Location
+newJSFLightProjectPage1_use_default_path = Use default path
+newJSFLightProjectPage1_version = JSF Environment
+newJSFLightProjectPage1_template = Template
+
+newJSFLightProjectPage1_specifyProjectName = Specify Project Name
+newJSFLightProjectPage1_specifyLocation = Specify location
+newJSFLightProjectPage1_locationError = Location Error
+newJSFLightProjectPage1_projectExistsMessage = Project already exists
+
+# New JSF Project wizard
+NEW_JSF_PROJECT_WIZARD_WINDOW_TITLE = New JSF Project
+NEW_JSF_PROJECT_WIZARD_CREATE_STRUTS_PROJECT = Create JSF Project
+
+newJSFProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in JBoss Tools.
+newJSFProjectPage1_name = Project Name
+newJSFProjectPage1_location = Location
+newJSFProjectPage1_use_default_path = Use default path
+newJSFProjectPage1_version = JSF Environment
+newJSFProjectPage1_template = Template
+
+newJSFProjectPage1_specifyProjectName = Specify Project Name
+newJSFProjectPage1_specifyLocation = Specify location
+newJSFProjectPage1_locationError = Location Error
+newJSFProjectPage1_projectExistsMessage = Project already exists
+# Errors
+NewJSFProjectWizard.CannotCreateLocation.WindowTitle = Error
+NewJSFProjectWizard.CannotCreateLocation.ErrorMessage = Cannot create specify location
+
+org.jboss.tools.jsf.ui.wizard.project.ImportJSFWarWizard.mainPageTitle=JSF project
+
+IMPORT_JSF_PROJECT_WIZARD_WINDOW_TITLE = Import JSF Project
+ADD_JSF_NATURE = Add JSF Capabilities
+
+SharableImportJSFProject.Register_Web_Context_in_server.xml=Register Web Context in server.xml
+SharableNewJSFProject.Register_Web_Context_in_server.xml=Register Web Context in server.xml
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.properties 2009-09-15 15:10:31 UTC (rev 17590)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.properties 2009-09-15 15:11:23 UTC (rev 17591)
@@ -328,3 +328,36 @@
JSFValidatorExtension_CreateTag.WindowTitle=\u30BF\u30B0\u306E\u8FFD\u52A0
JSFValidatorExtension_CreateTag.Title=\u30BF\u30B0
JSFConfigExtensions_Properties.Title=\u62E1\u5F35
+
+newJSFLightProjectPage1_introduction=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+newJSFLightProjectPage1_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D
+newJSFLightProjectPage1_location=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+newJSFLightProjectPage1_use_default_path=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30D1\u30B9\u3092\u4F7F\u7528
+newJSFLightProjectPage1_version=JSF \u74B0\u5883
+newJSFLightProjectPage1_template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+newJSFLightProjectPage1_specifyProjectName=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u6307\u5B9A
+newJSFLightProjectPage1_specifyLocation=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+newJSFLightProjectPage1_locationError=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30E9\u30FC
+newJSFLightProjectPage1_projectExistsMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+NEW_JSF_PROJECT_WIZARD_WINDOW_TITLE=\u65B0\u898F JSF \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+NEW_JSF_PROJECT_WIZARD_CREATE_STRUTS_PROJECT=JSF \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
+newJSFProjectPage1_introduction=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+newJSFProjectPage1_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D
+newJSFProjectPage1_location=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+newJSFProjectPage1_use_default_path=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30D1\u30B9\u3092\u4F7F\u7528
+newJSFProjectPage1_version=JSF \u74B0\u5883
+newJSFProjectPage1_template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+newJSFProjectPage1_specifyProjectName=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u6307\u5B9A
+newJSFProjectPage1_specifyLocation=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+newJSFProjectPage1_locationError=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30E9\u30FC
+newJSFProjectPage1_projectExistsMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+NewJSFProjectWizard.CannotCreateLocation.WindowTitle=\u30A8\u30E9\u30FC
+NewJSFProjectWizard.CannotCreateLocation.ErrorMessage=\u6307\u5B9A\u3055\u308C\u305F\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+
+org.jboss.tools.jsf.ui.wizard.project.ImportJSFWarWizard.mainPageTitle=JSF \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+
+IMPORT_JSF_PROJECT_WIZARD_WINDOW_TITLE=JSF \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+ADD_JSF_NATURE=JSF \u6A5F\u80FD\u306E\u8FFD\u52A0
+
+SharableImportJSFProject.Register_Web_Context_in_server.xml=server.xml \u306B Web \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u767B\u9332
+SharableNewJSFProject.Register_Web_Context_in_server.xml=server.xml \u306B Web \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u767B\u9332
14 years, 9 months
JBoss Tools SVN: r17588 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-09-15 11:02:30 -0400 (Tue, 15 Sep 2009)
New Revision: 17588
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-15 14:54:19 UTC (rev 17587)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-15 15:02:30 UTC (rev 17588)
@@ -253,10 +253,10 @@
if(expression != null){
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
- match(file, offset+pi.getStartPosition(), pi.getName().getStart()+pi.getName().getLength()-pi.getStartPosition());
+ match(file, offset+pi.getName().getStart(), pi.getName().getLength());
}else if(expression instanceof ELMethodInvocation){
ELMethodInvocation mi = (ELMethodInvocation)expression;
- match(file, offset+mi.getStartPosition(), mi.getName().getStart()+mi.getName().getLength()-mi.getStartPosition());
+ match(file, offset+mi.getName().getStart(), mi.getName().getLength());
}
}
}
@@ -325,12 +325,16 @@
protected abstract void match(IFile file, int offset, int length);
public static String getPropertyName(String methodName){
- if(methodName.startsWith(GET) || methodName.startsWith(SET))
- return methodName.substring(3).toLowerCase();
+ if(methodName.startsWith(GET) || methodName.startsWith(SET)){
+ String name = methodName.substring(3);
+ return name.substring(0, 1).toLowerCase()+name.substring(1);
+ }
- if(methodName.startsWith(IS))
- return methodName.substring(2).toLowerCase();
+ if(methodName.startsWith(IS)){
+ String name = methodName.substring(2);
+ return name.substring(0, 1).toLowerCase()+name.substring(1);
+ }
- return methodName.toLowerCase();
+ return methodName;
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-15 14:54:19 UTC (rev 17587)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-15 15:02:30 UTC (rev 17588)
@@ -10,33 +10,52 @@
******************************************************************************/
package org.jboss.tools.seam.internal.core.refactoring;
+import java.util.ArrayList;
+
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
+import org.eclipse.ltk.internal.core.refactoring.Messages;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.text.edits.TextEdit;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.model.ELMethodInvocation;
+import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
+import org.jboss.tools.seam.core.SeamCoreMessages;
public class SeamRenameMethodParticipant extends RenameParticipant{
private IMethod method;
private String oldName;
private String newName;
private SeamRenameMethodSearcher searcher;
+ private RefactoringStatus status;
+ private CompositeChange rootChange;
+ private TextFileChange lastChange;
+ private ArrayList<String> keys = new ArrayList<String>();
@Override
public RefactoringStatus checkConditions(IProgressMonitor pm,
CheckConditionsContext context) throws OperationCanceledException {
- return null;
+ searcher.findELReferences();
+
+ return status;
}
@Override
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
- return null;
+ return rootChange;
}
@Override
@@ -47,16 +66,49 @@
@Override
protected boolean initialize(Object element) {
if(element instanceof IMethod){
+ status = new RefactoringStatus();
+
+ rootChange = new CompositeChange("");
method = (IMethod)element;
- oldName = method.getElementName();
- newName = getArguments().getNewName();
+ oldName = SeamRenameMethodSearcher.getPropertyName(method.getElementName());
+ newName = SeamRenameMethodSearcher.getPropertyName(getArguments().getNewName());
searcher = new SeamRenameMethodSearcher((IFile)method.getResource(), oldName);
return true;
}
return false;
}
+ protected TextFileChange getChange(IFile file){
+ if(lastChange != null && lastChange.getFile().equals(file))
+ return lastChange;
+
+ for(int i=0; i < rootChange.getChildren().length; i++){
+ TextFileChange change = (TextFileChange)rootChange.getChildren()[i];
+ if(change.getFile().equals(file)){
+ lastChange = change;
+ return lastChange;
+ }
+ }
+ lastChange = new TextFileChange(file.getName(), file);
+ MultiTextEdit root = new MultiTextEdit();
+ lastChange.setEdit(root);
+ rootChange.add(lastChange);
+
+ return lastChange;
+ }
+
+ private void change(IFile file, int offset, int length, String text){
+ //System.out.println("change file - "+file.getFullPath()+" offset - "+offset+" len - "+length+" text <"+text+">");
+ String key = file.getFullPath().toString()+" "+offset;
+ if(!keys.contains(key)){
+ TextFileChange change = getChange(file);
+ TextEdit edit = new ReplaceEdit(offset, length, text);
+ //change.addEdit(edit);
+ keys.add(key);
+ }
+ }
+
class SeamRenameMethodSearcher extends SeamRefactorSearcher{
public SeamRenameMethodSearcher(IFile file, String name){
super(file, name);
@@ -64,11 +116,37 @@
@Override
protected boolean isFileCorrect(IFile file) {
- return false;
+ if(!file.isSynchronized(IResource.DEPTH_ZERO)){
+ status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROCESSOR_OUT_OF_SYNC_FILE, file.getFullPath().toString()));
+ return false;
+ }else if(file.isPhantom()){
+ status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROCESSOR_ERROR_PHANTOM_FILE, file.getFullPath().toString()));
+ return false;
+ }else if(file.isReadOnly()){
+ status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE, file.getFullPath().toString()));
+ return false;
+ }
+ return true;
}
+
+ protected ELInvocationExpression findComponentReference(ELInvocationExpression invocationExpression){
+ ELInvocationExpression invExp = invocationExpression;
+ while(invExp != null){
+ if(invExp instanceof ELMethodInvocation || invExp instanceof ELPropertyInvocation){
+ if(invExp.getMemberName() != null && invExp.getMemberName().equals(propertyName))
+ return invExp;
+ else
+ invExp = invExp.getLeft();
+ }else{
+ invExp = invExp.getLeft();
+ }
+ }
+ return null;
+ }
@Override
protected void match(IFile file, int offset, int length) {
+ change(file, offset, length, newName);
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java 2009-09-15 14:54:19 UTC (rev 17587)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java 2009-09-15 15:02:30 UTC (rev 17588)
@@ -93,7 +93,7 @@
ELInvocationExpression invExp = invocationExpression;
while(invExp != null){
if(invExp instanceof ELMethodInvocation || invExp instanceof ELPropertyInvocation){
- if(invExp.getMemberName() != null && invExp.getMemberName().equalsIgnoreCase(propertyName))
+ if(invExp.getMemberName() != null && invExp.getMemberName().equals(propertyName))
return invExp;
else
invExp = invExp.getLeft();
14 years, 9 months
JBoss Tools SVN: r17587 - trunk/struts/plugins/org.jboss.tools.struts.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 10:54:19 -0400 (Tue, 15 Sep 2009)
New Revision: 17587
Modified:
trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml
Log:
Modified: trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml 2009-09-15 14:29:50 UTC (rev 17586)
+++ trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml 2009-09-15 14:54:19 UTC (rev 17587)
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<XStudio model-entity="SharableXStudio" NAME="XStudio" SCOPE="project">
<Options model-entity="SharableOptions" NAME="Options" SCOPE="project">
+ <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project"
+ selectSourceTab="no" tabWidth="4" useRedHatEditors="yes">
+ <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
+ SCOPE="project" action_font="default,size=8,style=1"
+ forward_font="default,size=7,style=1" grid_step="16"
+ path_font="default,size=8,style=1" removePageWithFile="yes" show_grid="yes"/>
+ </Editors>
<StrutsStudio model-entity="SharableStrutsStudio" NAME="Struts Studio" SCOPE="project">
<Verification model-entity="SharableVerification" NAME="Verification"
SCOPE="project" error_number_limit="unlimited"/>
@@ -68,13 +75,6 @@
NAME="Default Error Messages" SCOPE="project" text="errors.required={0} is required.\n\nerrors.minlength={0} can not be less than {1} characters.\nerrors.maxlength={0} can not be greater than {1} characters.\nerrors.invalid={0} is invalid.\n \nerrors.byte={0} must be a byte.\nerrors.short={0} must be a short.\nerrors.integer={0} must be an integer.\nerrors.long={0} must be a long.\nerrors.float={0} must be a float.\nerrors.double={0} must be a double.\n \nerrors.date={0} is not a date.\nerrors.range={0} is not in the range {1} through {2}.\nerrors.creditcard={0} is an invalid credit card number.\nerrors.email={0} is an invalid e-mail address.\n"/>
</ResourcesInsets>
</Automation>
- <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project"
- selectSourceTab="no" tabWidth="4" useRedHatEditors="yes">
- <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
- SCOPE="project" action_font="default,size=8,style=1"
- forward_font="default,size=7,style=1" grid_step="16"
- path_font="default,size=8,style=1" removePageWithFile="yes" show_grid="yes"/>
- </Editors>
</StrutsStudio>
</Options>
</XStudio>
14 years, 9 months
JBoss Tools SVN: r17586 - in trunk/jst: plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-09-15 10:29:50 -0400 (Tue, 15 Sep 2009)
New Revision: 17586
Added:
trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/
trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java
trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java
Log:
JBIDE-4850
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-15 14:29:50 UTC (rev 17586)
@@ -19,6 +19,7 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jst.css,
+ org.jboss.tools.jst.css.common,
org.jboss.tools.jst.css.messages,
org.jboss.tools.jst.css.properties,
org.jboss.tools.jst.css.view
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -59,11 +59,15 @@
private void startListening() {
PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getSelectionService().addPostSelectionListener(this);
+// PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+// .getSelectionService().addSelectionListener(this);
}
private void stopListening() {
PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getSelectionService().removePostSelectionListener(this);
+ // PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ // .getSelectionService().addSelectionListener(this);
}
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-09-15 14:29:50 UTC (rev 17586)
@@ -20,7 +20,10 @@
org.jboss.tools.jst.css,
org.eclipse.core.databinding,
org.eclipse.ui.views.properties.tabbed,
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.jsp,
+ org.eclipse.wst.xml.core,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.jst.web
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Added: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp 2009-09-15 14:29:50 UTC (rev 17586)
@@ -0,0 +1,16 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+
+<html>
+<head>
+<style type="text/css" id="styleID">.classA {color: red}</style>
+</head>
+
+<body>
+<f:view>
+ <h:outputText value="some text" id="cssViewTest" />
+</f:view>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -21,12 +21,17 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.jst.css.properties.CSSPropertyPage;
+import org.jboss.tools.jst.css.view.CSSEditorView;
+import org.jboss.tools.test.util.JobUtils;
/**
* @author Sergey Dzmitrovich
@@ -43,6 +48,7 @@
public static final String CSS_EDITOR_ID = "org.eclipse.wst.css.core.csssource.source"; //$NON-NLS-1$
public static final String CSS_PERSPECTIVE = "org.jboss.tools.jst.cssPerspective"; //$NON-NLS-1$
public static final String IMPORT_PROJECT_NAME = "cssTest"; //$NON-NLS-1$
+ public static final String CSS_PREVIEW_SELECTED_OBJECT = "selectedObject"; //$NON-NLS-1$
/**
*
@@ -88,13 +94,19 @@
public void setSelection(StructuredTextEditor textEditor, int offset,
int length) {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .activate(textEditor);
+ activatePart(textEditor);
textEditor.selectAndReveal(offset, length);
+ JobUtils.delay(1000);
+
}
+ protected void activatePart(IWorkbenchPart part) {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .activate(part);
+ }
+
/**
*
*/
@@ -118,6 +130,23 @@
/**
*
+ * @param viewId
+ * @return
+ * @throws PartInitException
+ */
+ public void hideView(String viewId) throws PartInitException {
+ IWorkbenchPage activePage = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+
+ IViewPart viewPart = activePage.findView(viewId);
+ if (viewPart != null)
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().hideView(viewPart);
+
+ }
+
+ /**
+ *
* @param file
* @return
*/
@@ -146,6 +175,18 @@
return getFieldValue(object, object.getClass(), fieldName);
}
+ protected Object getSelectedObject(CSSEditorView view)
+ throws SecurityException, IllegalArgumentException,
+ NoSuchFieldException, IllegalAccessException {
+
+ CSSPropertyPage page = (CSSPropertyPage) view.getCurrentPage();
+
+ assertNotNull(page);
+
+ return getFieldValue(page, CSS_PREVIEW_SELECTED_OBJECT);
+
+ }
+
/**
*
* @param object
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -14,6 +14,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.jst.css.test.jbide.ExtendingCSSViewTest_JBIDE4850;
import org.jboss.tools.jst.css.test.jbide.InputFractionalValueTest_JBIDE4790;
import org.jboss.tools.jst.css.test.jbide.SelectionLosingByPropertySheet_JBIDE4791;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -32,9 +33,10 @@
TestSuite suite = new TestSuite("Tests for CSS views"); //$NON-NLS-1$
// $JUnit-BEGIN$
-// suite.addTestSuite(CSSViewTest.class);
-// suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class);
+ suite.addTestSuite(CSSViewTest.class);
+ suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class);
suite.addTestSuite(SelectionLosingByPropertySheet_JBIDE4791.class);
+ suite.addTestSuite(ExtendingCSSViewTest_JBIDE4850.class);
// $JUnit-END$
return new ProjectImportTestSetup(
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -30,6 +30,7 @@
import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.jst.css.common.StyleContainer;
import org.jboss.tools.jst.css.properties.CSSPropertyPage;
import org.jboss.tools.jst.css.view.CSSEditorView;
import org.jboss.tools.jst.css.view.CSSPreview;
@@ -43,12 +44,12 @@
*/
public class CSSViewTest extends AbstractCSSViewTest {
-
public static final String TEST_PAGE_NAME = "test.css"; //$NON-NLS-1$
+ public static final String SELECTED_OBJECT_FIELD = "selectedObject"; //$NON-NLS-1$
+
public static final int COUNT_TABS = 5;
-
/**
*
* @throws PartInitException
@@ -75,10 +76,6 @@
assertNotNull(view);
- CSSPropertyPage page = (CSSPropertyPage) view.getCurrentPage();
-
- assertNotNull(page);
-
ICSSModel model = (ICSSModel) getStructuredModel(pageFile);
assertNotNull(model);
@@ -96,18 +93,18 @@
setSelection(editor, offset, 0);
- JobUtils.delay(1000);
- Object selectedObject = getFieldValue(page, "selectedObject"); //$NON-NLS-1$
+ Object selectedObject = getSelectedObject(view);
+ assertTrue(selectedObject instanceof StyleContainer);
+ assertEquals(cssRule, ((StyleContainer) selectedObject)
+ .getStyleObject());
setSelection(editor, 0, 0);
- JobUtils.delay(1000);
- selectedObject = getFieldValue(page, "selectedObject"); //$NON-NLS-1$
+ selectedObject = getSelectedObject(view);
+ assertNull(selectedObject);
- assertNotSame(cssRule, selectedObject);
-
}
public void testEditorViewTabs() throws CoreException, SecurityException,
@@ -149,7 +146,6 @@
setSelection(editor, offset, 0);
- JobUtils.delay(1000);
TabbedPropertyRegistry registry = (TabbedPropertyRegistry) getFieldValue(
page, TabbedPropertySheetPage.class, "registry");//$NON-NLS-1$
@@ -214,7 +210,6 @@
setSelection(editor, offset, 0);
- JobUtils.delay(1000);
assertFalse(browserPage.equals(view.generateBrowserPage()));
Added: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.css.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.jboss.tools.jst.css.common.StyleContainer;
+import org.jboss.tools.jst.css.test.AbstractCSSViewTest;
+import org.jboss.tools.jst.css.view.CSSEditorView;
+import org.jboss.tools.test.util.JobUtils;
+import org.w3c.dom.Element;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public class ExtendingCSSViewTest_JBIDE4850 extends AbstractCSSViewTest {
+
+ public static final String TEST_PAGE_NAME = "JBIDE/4850/cssViewTest.jsp"; //$NON-NLS-1$
+
+ /** jsp editor id */
+ public static final String JSP_EDITOR_ID = "org.eclipse.jst.jsp.core.jspsource.source";//"org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$
+
+ public static final String TESTED_ELEMENT_ID = "cssViewTest"; //$NON-NLS-1$
+
+ public static final String TESTED_STYLE_ID = "styleID"; //$NON-NLS-1$
+
+ public void testInlineStyleEditing() throws CoreException,
+ SecurityException, IllegalArgumentException, NoSuchFieldException,
+ IllegalAccessException {
+
+ IFile pageFile = getComponentPath(TEST_PAGE_NAME, getProjectName());
+
+ assertNotNull(pageFile);
+
+ StructuredTextEditor editor = (StructuredTextEditor) openEditor(
+ pageFile, JSP_EDITOR_ID);
+
+ JobUtils.waitForIdle();
+
+ assertNotNull(editor);
+
+ CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW);
+
+ assertNotNull(view);
+
+ IDOMModel model = (IDOMModel) getStructuredModel(pageFile);
+
+ assertNotNull(model);
+
+ IDOMDocument document = model.getDocument();
+
+ assertNotNull(document);
+
+ Element element = document.getElementById(TESTED_ELEMENT_ID);
+
+ assertNotNull(element);
+
+ int offset = ((IndexedRegion) element).getStartOffset();
+
+ setSelection(editor, offset, 0);
+
+ Object selectedObject = getSelectedObject(view);
+
+ assertTrue(selectedObject instanceof StyleContainer);
+
+ assertSame(element, ((StyleContainer) selectedObject).getStyleObject());
+
+ }
+
+ public void testStyleTagEditing() throws CoreException, SecurityException,
+ IllegalArgumentException, NoSuchFieldException,
+ IllegalAccessException {
+
+ IFile pageFile = getComponentPath(TEST_PAGE_NAME, getProjectName());
+
+ assertNotNull(pageFile);
+
+ StructuredTextEditor editor = (StructuredTextEditor) openEditor(
+ pageFile, JSP_EDITOR_ID);
+
+ JobUtils.waitForIdle();
+
+ assertNotNull(editor);
+
+ CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW);
+
+ assertNotNull(view);
+
+ IDOMModel model = (IDOMModel) getStructuredModel(pageFile);
+
+ assertNotNull(model);
+
+ IDOMDocument document = model.getDocument();
+
+ assertNotNull(document);
+
+ Element element = document.getElementById(TESTED_STYLE_ID);
+
+ assertNotNull(element);
+
+ int offset = ((IDOMElement) element).getStartEndOffset();
+
+ setSelection(editor, offset, 0);
+
+ Object selectedObject = getSelectedObject(view);
+
+ assertTrue(selectedObject instanceof StyleContainer);
+
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -111,7 +111,7 @@
newTestedValue);
} catch (DOMException e) {
- fail("Changing of attribute's value leads to DOMException. Probably it is regression of JBIDE-4790 "); //$NON-NLS-1$
+ fail("Changing of attribute's value leads to DOMException. Probably it is problem concerned with of JBIDE-4790 "); //$NON-NLS-1$
}
testedValue = declaration.getPropertyValue(TEST_CSS_ATTRIBUTE_NAME);
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 12:58:14 UTC (rev 17585)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 14:29:50 UTC (rev 17586)
@@ -82,9 +82,9 @@
.getFirstElement());
CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW);
-
- JobUtils.delay(2000);
+ JobUtils.delay(1000);
+
selection = (ISelection) getFieldValue(propertySheet,
SELECTION_FIELD_NAME);
14 years, 9 months
JBoss Tools SVN: r17585 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/options and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 08:58:14 -0400 (Tue, 15 Sep 2009)
New Revision: 17585
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Node 'Editors' moved to Option root
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml 2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml 2009-09-15 12:58:14 UTC (rev 17585)
@@ -4431,6 +4431,10 @@
</Icons>
</XStudioIcons>
<Options model-entity="SharableOptions" NAME="Options" SCOPE="project">
+ <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project">
+ <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
+ SCOPE="project" grid_step="16" show_grid="yes" />
+ </Editors>
<JSFStudio model-entity="SharableJSFStudio" NAME="JSF Studio"
SCOPE="project">
<JSFProject model-entity="SharableJSFProject" NAME="Project"
@@ -4517,10 +4521,6 @@
text="errors.required={0} is required.\nerrors.minlength={0} can not be less than {1} characters.\nerrors.maxlength={0} can not be greater than {1} characters.\nerrors.invalid={0} is invalid.\n \nerrors.byte={0} must be a byte.\nerrors.short={0} must be a short.\nerrors.integer={0} must be an integer.\nerrors.long={0} must be a long.\nerrors.float={0} must be a float.\nerrors.double={0} must be a double.\n \nerrors.date={0} is not a date.\nerrors.range={0} is not in the range {1} through {2}.\nerrors.creditcard={0} is an invalid credit card number.\nerrors.email={0} is an invalid e-mail address.\n" />
</ResourcesInsets>
</Automation>
- <Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project">
- <StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
- SCOPE="project" grid_step="16" show_grid="yes" />
- </Editors>
</StrutsStudio>
</Options>
</XStudio>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2009-09-15 12:58:14 UTC (rev 17585)
@@ -193,52 +193,6 @@
<XActionItem kind="list"/>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%Options%" name="SharableEditors">
- <XChildrenEntities>
- <XChildEntity maxCount="1" name="SharableStrutsEditor" required="yes"/>
- <XChildEntity maxCount="1" name="SharableJSFEditor" required="yes"/>
- <XChildEntity maxCount="1" name="SharableTilesEditor" required="yes"/>
- <XChildEntity maxCount="1" name="SharableVPEEditor" required="yes"/>
- <XChildEntity maxCount="1" name="SharableSeamPagesEditor" required="yes"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.xstudio.options.root" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="options" loader="ElementType"
- name="element type" visibility="false">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute default="Editors" name="name" visibility="false" xmlname="NAME">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute default="yes" name="useRedHatEditors" xmlname="useRedHatEditors">
- <Constraint loader="List">
- <value name="yes"/>
- <value name="no"/>
- </Constraint>
- <Editor name="CheckBox"/>
- </XModelAttribute>
- <XModelAttribute default="yes" name="natureWarning" xmlname="natureWarning">
- <Constraint loader="List">
- <value name="yes"/>
- <value name="no"/>
- </Constraint>
- <Editor name="CheckBox"/>
- </XModelAttribute>
- <XModelAttribute default="no" name="selectSourceTab" xmlname="selectSourceTab">
- <Constraint loader="List">
- <value name="yes"/>
- <value name="no"/>
- </Constraint>
- <Editor name="CheckBox"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list"/>
- <XDependencies/>
- </XModelEntity>
<XModelEntity ImplementingClass="%Options%" name="SharableImportJSFProject">
<XChildrenEntities/>
<XEntityRenderer>
@@ -1139,7 +1093,6 @@
<XChildrenEntities>
<XChildEntity maxCount="1" name="SharableRunning" required="yes"/>
<XChildEntity maxCount="1" name="SharableProject" required="yes"/>
- <XChildEntity maxCount="1" name="SharableEditors" required="yes"/>
<XChildEntity maxCount="1" name="SharableAutomation" required="yes"/>
<XChildEntity maxCount="1" name="SharableCodeGeneration" required="yes"/>
<XChildEntity maxCount="1" name="SharableLinkRecognizer" required="yes"/>
@@ -1373,6 +1326,16 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XEntityExtension name="SharableEditors">
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="SharableStrutsEditor" required="yes"/>
+ <XChildEntity maxCount="1" name="SharableJSFEditor" required="yes"/>
+ <XChildEntity maxCount="1" name="SharableTilesEditor" required="yes"/>
+ <XChildEntity maxCount="1" name="SharableVPEEditor" required="yes"/>
+ <XChildEntity maxCount="1" name="SharableSeamPagesEditor" required="yes"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
<XEntityExtension name="SharableOptions">
<XChildrenEntities>
<XChildEntity maxCount="1" name="SharableJSFStudio" required="yes"/>
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta 2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta 2009-09-15 12:58:14 UTC (rev 17585)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" "meta.dtd">
+<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
+ "meta.dtd">
<XModelEntityGroup>
<VERSION MODULE="Model" VERSION="1.0"/>
<MAPPINGS>
@@ -22,17 +23,12 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="root" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="Root" name="name" visibility="false" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute default="Root" name="project name" visibility="false">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute default="Root" name="project name" visibility="false"/>
</XModelAttributes>
<XActionItem kind="list">
<XActionItem
@@ -51,11 +47,9 @@
<XModelAttributes>
<XModelAttribute default="editor options" loader="ElementType"
name="element type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="Editor" name="name" visibility="false" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="4" name="tab size" xmlname="TAB_SIZE">
@@ -95,6 +89,46 @@
<XActionItem kind="list"/>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%Options%" name="SharableEditors">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.xstudio.options.root" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="options" loader="ElementType"
+ name="element type" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute default="Editors" name="name" visibility="false" xmlname="NAME">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute default="yes" name="useRedHatEditors" xmlname="useRedHatEditors">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="CheckBox"/>
+ </XModelAttribute>
+ <XModelAttribute default="yes" name="natureWarning" xmlname="natureWarning">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="CheckBox"/>
+ </XModelAttribute>
+ <XModelAttribute default="no" name="selectSourceTab" xmlname="selectSourceTab">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="CheckBox"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list"/>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity ImplementingClass="%Options%" XMLSUBPATH="EDITOR" name="SharableExternalEditor">
<XChildrenEntities/>
<XEntityRenderer>
@@ -105,13 +139,9 @@
<XModelAttributes>
<XModelAttribute default="editor" loader="ElementType"
name="element type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute name="name" xmlname="NAME">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="name" xmlname="NAME"/>
<XModelAttribute name="path" xmlname="PATH">
<Constraint loader="FileFilter">
<value name="allFiles=false"/>
@@ -156,25 +186,20 @@
<XModelAttributes>
<XModelAttribute default="partition" loader="ElementType"
name="element type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="External Programs" name="name"
visibility="false" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute name="extensions" xmlname="EXTENSIONS">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="extensions" xmlname="EXTENSIONS"/>
</XModelAttributes>
<XActionItem kind="list">
<XActionItem ICON="action.newpackage" displayName="Create"
kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%"
- ICON="action.empty" PROPERTIES="input=no"
- WizardClassName="%Default%" displayName="Add New..." kind="action" name="CreateEditor">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="input=no" WizardClassName="%Default%"
+ displayName="Add New..." kind="action" name="CreateEditor">
<EntityData EntityName="SharableExternalEditor">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="path"/>
@@ -185,7 +210,9 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%Options%" name="SharableOptions">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="SharableEditors" required="yes"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.xstudio.options.root" type="main"/>
@@ -194,11 +221,9 @@
<XModelAttributes>
<XModelAttribute default="options" loader="ElementType"
name="element type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="Options" name="name" visibility="false" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
</XModelAttributes>
@@ -215,11 +240,9 @@
<XModelAttributes>
<XModelAttribute default="preferences" loader="ElementType"
name="element type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="Preferences" name="name" visibility="false" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="10" name="undo capacity" xmlname="UNDO_CAPACITY">
@@ -228,10 +251,7 @@
</XModelAttribute>
<XModelAttribute
default="FLOW:*.txt,*.xml;HTML:*.htm,*html;XML:*.xml;XSL:*.xsl;DTD:*.dtd"
- name="location filters" visibility="false" xmlname="LOCATION_FILTERS">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ name="location filters" visibility="false" xmlname="LOCATION_FILTERS"/>
<XModelAttribute default="no" name="show modifiers" xmlname="SHOW_MODIFIERS">
<Constraint loader="List">
<value name="no"/>
@@ -262,19 +282,12 @@
<Editor name="List"/>
</XModelAttribute>
<XModelAttribute name="last new version check" visibility="false" xmlname="LAST_NEW_VERSION_CHECK">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="http://localhost:8880/"
- name="browser prefix" xmlname="BROWSER_PREFIX">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ name="browser prefix" xmlname="BROWSER_PREFIX"/>
<XModelAttribute default="http://uddi.microsoft.com/inquire"
- name="uddi urls" visibility="false" xmlname="UDDI_URLS">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ name="uddi urls" visibility="false" xmlname="UDDI_URLS"/>
</XModelAttributes>
<XActionItem kind="list"/>
<XDependencies/>
@@ -289,11 +302,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="XStudio settings" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="XStudioSet" name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="project" name="scope" visibility="false">
@@ -310,10 +321,7 @@
</Constraint>
<Editor name="ListAdd"/>
</XModelAttribute>
- <XModelAttribute name="body" visibility="false" xmlname="BODY">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="body" visibility="false" xmlname="BODY"/>
</XModelAttributes>
<XActionItem ICON="main.package" displayName="XStudioSet" group="1"
kind="list" name="XStudioSetActions"/>
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java 2009-09-15 12:58:14 UTC (rev 17585)
@@ -22,7 +22,7 @@
private String option;
private String attributeName;
public static final String OPTIONS_PATH = "%Options%"; //$NON-NLS-1$
- public static String EDITOR_PATH = "%Options%/Struts Studio/Editors"; //$NON-NLS-1$
+ public static String EDITOR_PATH = "%Options%/Editors"; //$NON-NLS-1$
public static final Preference SHOW_NATURE_WARNING = new Preference(EDITOR_PATH, "natureWarning"); //$NON-NLS-1$
protected Preference(String optionPath, String attributeName) {
14 years, 9 months
JBoss Tools SVN: r17584 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 08:26:34 -0400 (Tue, 15 Sep 2009)
New Revision: 17584
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java 2009-09-15 12:25:39 UTC (rev 17583)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java 2009-09-15 12:26:34 UTC (rev 17584)
@@ -18,7 +18,7 @@
public static final String OPTIONS_JSF_PROJECT_PATH = OPTIONS_JSFSTUDIO_PATH + "/Project"; //$NON-NLS-1$
public static final String OPTIONS_JSF_NEW_PROJECT_PATH = OPTIONS_JSF_PROJECT_PATH + "/New Project"; //$NON-NLS-1$
public static final String OPTIONS_JSF_IMPORT_PROJECT_PATH = OPTIONS_JSF_PROJECT_PATH + "/Import Project"; //$NON-NLS-1$
- public static String JSF_EDITOR_PATH = "%Options%/Struts Studio/Editors/JSF Flow Diagram"; //$NON-NLS-1$
+ public static String JSF_EDITOR_PATH = Preference.EDITOR_PATH + "/JSF Flow Diagram"; //$NON-NLS-1$
public static String JSF_ADD_VIEW_PATH = JSF_EDITOR_PATH + "/Add View"; //$NON-NLS-1$
public static final Preference USE_DEFAULT_JSF_PROJECT_ROOT = new JSFPreference(OPTIONS_JSF_NEW_PROJECT_PATH, "Use Default Path"); //$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r17583 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 08:25:39 -0400 (Tue, 15 Sep 2009)
New Revision: 17583
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2009-09-15 12:24:57 UTC (rev 17582)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2009-09-15 12:25:39 UTC (rev 17583)
@@ -146,7 +146,7 @@
private void loadSelectedTab() {
IFile file = getFile();
try {
- if("yes".equals(PreferenceModelUtilities.getPreferenceModel().getByPath("%Options%/Struts Studio/Editors").getAttributeValue("selectSourceTab"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if("yes".equals(PreferenceModelUtilities.getPreferenceModel().getByPath(Preference.EDITOR_PATH).getAttributeValue("selectSourceTab"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
selectedPageIndex = getSourcePageIndex();
} else if(file == null) {
loadSelectedTabForStorage();
14 years, 9 months
JBoss Tools SVN: r17582 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 08:24:57 -0400 (Tue, 15 Sep 2009)
New Revision: 17582
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java 2009-09-15 12:20:28 UTC (rev 17581)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java 2009-09-15 12:24:57 UTC (rev 17582)
@@ -30,7 +30,7 @@
public static final Preference DEFAULT_STRUTS_IMPORT_SERVLET_VERSION = new StrutsPreference(OPTIONS_IMPORT_PROJECT_PATH, "Servlet Version"); //$NON-NLS-1$
- public static final String WEB_FLOW_DIAGRAM_PATH = "%Options%/Struts Studio/Editors/Web Flow Diagram"; //$NON-NLS-1$
+ public static final String WEB_FLOW_DIAGRAM_PATH = Preference.EDITOR_PATH + "/Web Flow Diagram"; //$NON-NLS-1$
public static final Preference REMOVE_PAGE_AND_FILE = new StrutsPreference(WEB_FLOW_DIAGRAM_PATH, "removePageWithFile"); //$NON-NLS-1$
public static final Preference DO_NOT_SHOW_DIAGRAM = new StrutsPreference(WEB_FLOW_DIAGRAM_PATH, "doNotShowDiagram"); //$NON-NLS-1$
public static final Preference ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETED = new StrutsPreference(WEB_FLOW_DIAGRAM_PATH, "enableControlModeOnTransitionCompleted"); //$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r17581 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-15 08:20:28 -0400 (Tue, 15 Sep 2009)
New Revision: 17581
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java 2009-09-15 12:18:30 UTC (rev 17580)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java 2009-09-15 12:20:28 UTC (rev 17581)
@@ -17,10 +17,11 @@
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.common.model.plugin.ModelPlugin;
public class TilesEditorTabbedPreferencesPage extends TabbedPreferencesPage implements IWorkbenchPreferencePage {
- public static String TILES_EDITOR_PATH = "%Options%/Struts Studio/Editors/Tiles Diagram"; //$NON-NLS-1$
+ public static String TILES_EDITOR_PATH = Preference.EDITOR_PATH + "/Tiles Diagram"; //$NON-NLS-1$
public TilesEditorTabbedPreferencesPage() {
XModel model = getPreferenceModel();
14 years, 9 months