Author: scabanovich Date: 2010-01-25 10:28:36 -0500 (Mon, 25 Jan 2010) New Revision: 19910 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-5712 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2010-01-25 15:15:35 UTC (rev 19909) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2010-01-25 15:28:36 UTC (rev 19910) @@ -66,8 +66,11 @@ public static String WebAppFoldersFormLayoutData_ServletMappings; public static String WebAppFoldersFormLayoutData_Servlets; public static String WebAppFoldersFormLayoutData_WebAppMimeMapping; + public static String WebAppFoldersFormLayoutData_LifecycleCallbacks; + public static String WebAppFoldersFormLayoutData_Persistence; public static String WebCompoundEditor_WebXMLEditor; public static String XActionProvider_CompanyName; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java 2010-01-25 15:15:35 UTC (rev 19909) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFoldersFormLayoutData.java 2010-01-25 15:28:36 UTC (rev 19910) @@ -20,6 +20,8 @@ static String CONTEXT_PARAM_ENTITY = WebAppHelper.CONTEXT_PARAM_ENTITY; static String FILTER_FOLDER_ENTITY = "WebAppFolderFilters"; //$NON-NLS-1$ static String FILTER_FOLDER_24_ENTITY = "WebAppFolderFilters24"; //$NON-NLS-1$ + static String LIFECYCLE_FOLDER_24_ENTITY = "WebAppFolderLifecycles25"; //$NON-NLS-1$ + static String PERSISTENCE_FOLDER_24_ENTITY = "WebAppFolderPersistence25"; //$NON-NLS-1$ static String LISTENER_FOLDER_ENTITY = "WebAppFolderListeners"; //$NON-NLS-1$ static String LISTENER_FOLDER_24_ENTITY = "WebAppFolderListeners24"; //$NON-NLS-1$ static String SERVLET_FOLDER_ENTITY = "WebAppFolderServlets"; //$NON-NLS-1$ @@ -63,6 +65,22 @@ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateFilterMapping") //$NON-NLS-1$ ); + static IFormData LIFECYCLE_LIST_DEFINITION = new FormData( + Messages.WebAppFoldersFormLayoutData_LifecycleCallbacks, + EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData("lifecycle-callback-method", 100)}, //$NON-NLS-1$ + new String[]{"WebAppPostConstruct25", "WebAppPreDestroy25"}, //$NON-NLS-1$ //$NON-NLS-2$ + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyCallback") //$NON-NLS-1$ + ); + + static IFormData PERSISTENCE_LIST_DEFINITION = new FormData( + Messages.WebAppFoldersFormLayoutData_Persistence, + EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData("ref-name", 50), new FormAttributeData("unit-name", 50)}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[]{"WebAppPersistenceContextRef25", "WebAppPersistenceUnitRef25"}, //$NON-NLS-1$ //$NON-NLS-2$ + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyRef") //$NON-NLS-1$ + ); + static IFormData FILTER_MAPPING_24_LIST_DEFINITION = new FormData( Messages.WebAppFoldersFormLayoutData_FilterMappings, EMPTY_DESCRIPTION, @@ -81,6 +99,14 @@ FILTER_MAPPING_24_LIST_DEFINITION }; + static IFormData[] LIFECYCLE_FOLDER_24_DEFINITIONS = new IFormData[]{ + LIFECYCLE_LIST_DEFINITION, + }; + + static IFormData[] PERSISTENCE_FOLDER_24_DEFINITIONS = new IFormData[]{ + PERSISTENCE_LIST_DEFINITION, + }; + static IFormData LISTENER_LIST_DEFINITION = new FormData( Messages.WebAppFoldersFormLayoutData_Listeners, EMPTY_DESCRIPTION, @@ -275,6 +301,12 @@ final static IFormData FILTER_FOLDER_24_DEFINITION = new FormData( FILTER_FOLDER_24_ENTITY, new String[]{null}, FILTER_FOLDER_24_DEFINITIONS); + final static IFormData LIFECYCLE_FOLDER_24_DEFINITION = new FormData( + LIFECYCLE_FOLDER_24_ENTITY, new String[]{null}, LIFECYCLE_FOLDER_24_DEFINITIONS); + + final static IFormData PERSISTENCE_FOLDER_24_DEFINITION = new FormData( + PERSISTENCE_FOLDER_24_ENTITY, new String[]{null}, PERSISTENCE_FOLDER_24_DEFINITIONS); + final static IFormData LISTENER_FOLDER_DEFINITION = new FormData( LISTENER_FOLDER_ENTITY, new String[]{null}, LISTENER_FOLDER_DEFINITIONS); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2010-01-25 15:15:35 UTC (rev 19909) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2010-01-25 15:28:36 UTC (rev 19910) @@ -33,6 +33,8 @@ WebAppFoldersFormLayoutData.FILTER_FOLDER_24_DEFINITION, WebAppFoldersFormLayoutData.LISTENER_FOLDER_DEFINITION, WebAppFoldersFormLayoutData.LISTENER_FOLDER_24_DEFINITION, + WebAppFoldersFormLayoutData.LIFECYCLE_FOLDER_24_DEFINITION, + WebAppFoldersFormLayoutData.PERSISTENCE_FOLDER_24_DEFINITION, WebAppFoldersFormLayoutData.SERVLET_FOLDER_DEFINITION, WebAppFoldersFormLayoutData.MIME_FOLDER_DEFINITION, WebAppFoldersFormLayoutData.ERROR_FOLDER_DEFINITION, Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2010-01-25 15:15:35 UTC (rev 19909) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2010-01-25 15:28:36 UTC (rev 19910) @@ -42,6 +42,8 @@ WebAppFileFormLayoutData_WebDesc25=Web Descriptor 2.5 WebAppFoldersFormLayoutData_ContextParams=Context Params WebAppFoldersFormLayoutData_Filters=Filters +WebAppFoldersFormLayoutData_LifecycleCallbacks=Lifecycle Callbacks +WebAppFoldersFormLayoutData_Persistence=Persistence WebAppFoldersFormLayoutData_ErrorPages=Error Pages WebAppFoldersFormLayoutData_WebAppErrorPage=WebAppErrorPage WebAppFoldersFormLayoutData_ResourceEnvRefs=Resource Env Refs