Author: sflanigan Date: 2009-07-03 02:56:02 -0400 (Fri, 03 Jul 2009) New Revision: 16372 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/.settings/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/.settings/org.eclipse.jdt.core.prefs Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormActionData.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ClassFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ComponentFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3CompositeElementFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3DatabaseObjectFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ElementFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FileFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FilterFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Added NON-NLS comments. Also added javadocs to show which params are translatable when constructing FormData etc. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormActionData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormActionData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormActionData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,6 +17,11 @@ private String label; private String actionPath; + /** + * + * @param label (translatable) + * @param actionPath (non-translatable) + */ public FormActionData(String label, String actionPath) { this.label = label; this.actionPath = actionPath; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -20,12 +20,20 @@ */ public class FormAttributeData implements IFormAttributeData { - private String name; + private String name; // (non-translatable) private ILayoutDataFactory layoutDataFactory; - private String wraperClassName; + private String wraperClassName; // (non-translatable) private int width; - private String displayName; + private String displayName; // (translatable) + /** + * + * @param name (non-translatable) + * @param layoutDataFactory + * @param wraperClassName (non-translatable) + * @param width + * @param displayname (translatable) + */ public FormAttributeData(String name, ILayoutDataFactory layoutDataFactory, String wraperClassName, int width, String displayname) { this.name = name; if(layoutDataFactory == null) layoutDataFactory = LayoutDataFactory.getInstance(); @@ -35,26 +43,59 @@ this.displayName = displayname; } + /** + * + * @param name (non-translatable) + * @param layoutDataFactory + * @param wraperClassName (non-translatable) + * @param width + */ public FormAttributeData(String name, ILayoutDataFactory layoutDataFactory, String wraperClassName, int width) { this(name, layoutDataFactory, wraperClassName, width, null); } + /** + * + * @param name (non-translatable) + * @param layoutDataFactory + * @param wraperClassName (non-translatable) + */ public FormAttributeData(String name, ILayoutDataFactory layoutDataFactory, String wraperClassName) { this(name, layoutDataFactory, wraperClassName, 0); } + /** + * + * @param name (non-translatable) + * @param layoutDataFactory + */ public FormAttributeData(String name, ILayoutDataFactory layoutDataFactory) { this(name, layoutDataFactory, null, 0); } - + + /** + * + * @param name (non-translatable) + * @param width + */ public FormAttributeData(String name, int width) { this(name, LayoutDataFactory.getInstance(), null, width); } + /** + * + * @param name (non-translatable) + * @param width + * @param displayName (translatable) + */ public FormAttributeData(String name, int width, String displayName) { this(name, LayoutDataFactory.getInstance(), null, width, displayName); } + /** + * + * @param name (non-translatable) + */ public FormAttributeData(String name) { this(name, LayoutDataFactory.getInstance(), null, 0); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,17 +17,28 @@ */ public class FormData implements IFormData { - private String header; - private String description; + private String header; // (translatable) + private String description; // (translatable) private IFormAttributeData[] attributes; - private String[] entities; + private String[] entities; // (non-translatable) private IFormActionData[] actions; private IFormData[] forms; - private String entityName; + private String entityName; // (non-translatable) private IWidgetSettings widgetSettings; private String formClassName; + /** + * + * @param header (translatable) + * @param description (translatable) + * @param entityName (non-translatable) + * @param attributes + * @param entities (non-translatable) + * @param actions + * @param forms + * @param widgetSettings + */ public FormData(String header, String description, String entityName, IFormAttributeData[] attributes, String[] entities, IFormActionData[] actions, IFormData[] forms, IWidgetSettings widgetSettings) { this.header = header; this.description = description; @@ -39,30 +50,75 @@ this.widgetSettings = widgetSettings; } + /** + * + * @param header (translatable) + * @param description (translatable) + * @param entityName (non-translatable) + * @param attributes + * @param entities (non-translatable) + * @param actions + */ public FormData(String header, String description, String entityName, IFormAttributeData[] attributes, String[] entities, IFormActionData[] actions) { this(header, description, entityName, attributes, entities, actions, null, new WhiteSettings()); } + /** + * + * @param header (translatable) + * @param description (translatable) + * @param attributes + * @param entities (non-translatable) + * @param actions + */ public FormData(String header, String description, IFormAttributeData[] attributes, String[] entities, IFormActionData[] actions) { this(header, description, null, attributes, entities, actions, null, new WhiteSettings()); } + /** + * + * @param entityName (non-translatable) + * @param entities (non-translatable) + * @param forms + */ public FormData(String entityName, String[] entities, IFormData[] forms) { this(null, null, entityName, null, entities, null, forms, new WhiteSettings()); } + /** + * + * @param header (translatable) + * @param description (translatable) + * @param entityName (non-translatable) + * @param attributes + */ public FormData(String header, String description, String entityName, IFormAttributeData[] attributes) { this(header, description, entityName, attributes, null, null, null, new WhiteSettings()); } + /** + * + * @param header (translatable) + * @param description (translatable) + * @param attributes + */ public FormData(String header, String description, IFormAttributeData[] attributes) { this(header, description, null, attributes, null, null, null, new WhiteSettings()); } + /** + * + * @param entityName (non-translatable) + * @param forms + */ public FormData(String entityName, IFormData[] forms) { this(null, null, entityName, null, null, null, forms, null); } + /** + * + * @param formClassName (non-translatable) + */ public FormData(String formClassName) { this.formClassName = formClassName; } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-03 06:56:02 UTC (rev 16372) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -24,8 +24,8 @@ final static IFormData CACHE_LIST_DEFINITION = new FormData( "Caches", "", //Description //$NON-NLS-1$ - "Caches", - new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, + "Caches", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$ new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY}, Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$ ); @@ -33,8 +33,8 @@ final static IFormData CACHE_FOLDER_DEFINITION = new FormData( "Caches", "", //"Description //$NON-NLS-1$ - "HibConfig3CachesFolder", - new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, + "HibConfig3CachesFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$ new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY}, Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$ ); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -19,49 +19,53 @@ * @author glory */ public class HibConfig3EventFormLayoutData { - static String EVENT_ENTITY = "HibConfig3Event"; - static String LISTENER_ENTITY = "HibConfig3Listener"; + static String EVENT_ENTITY = "HibConfig3Event"; //$NON-NLS-1$ + static String LISTENER_ENTITY = "HibConfig3Listener"; //$NON-NLS-1$ final static IFormData EVENT_LIST_DEFINITION = new FormData( "Events", - "", //Description - "Events", - new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, + "", //Description //$NON-NLS-1$ + "Events", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, //$NON-NLS-1$ new String[]{EVENT_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ ); final static IFormData EVENT_FOLDER_DEFINITION = new FormData( "Events", - "", //"Description - "HibConfig3EventsFolder", - new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, + "", //Description //$NON-NLS-1$ + "HibConfig3EventsFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, //$NON-NLS-1$ new String[]{EVENT_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ ); final static IFormData LISTENER_LIST_DEFINITION = new FormData( "Listeners", - "", //Description + "", //Description //$NON-NLS-1$ // "Listeners", - new FormAttributeData[]{new FormAttributeData("class", 70, "class"), new FormAttributeData("type", 30, "type")}, + new FormAttributeData[]{ + new FormAttributeData("class", 70, "class"), //$NON-NLS-1$ + new FormAttributeData("type", 30, "type")}, //$NON-NLS-1$ new String[]{LISTENER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") //$NON-NLS-1$ ); final static IFormData LISTENER_FOLDER_DEFINITION = new FormData( "Listeners", - "", //"Description - "HibConfig3ListenersFolder", - new FormAttributeData[]{new FormAttributeData("class", 70, "class"), new FormAttributeData("type", 30, "type")}, + "", //"Description //$NON-NLS-1$ + "HibConfig3ListenersFolder", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("class", 70, "class"), //$NON-NLS-1$ + new FormAttributeData("type", 30, "type")}, //$NON-NLS-1$ new String[]{LISTENER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") //$NON-NLS-1$ ); final static IFormData[] EVENT_DEFINITIONS = new IFormData[] { new FormData( "Event", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(EVENT_ENTITY) ), LISTENER_LIST_DEFINITION, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -22,11 +22,11 @@ new IFormData[] { new FormData( "File Hibernate Configuration 3.0", - "", //"Description - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("FileHibConfig3") + "", //"Description //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("FileHibConfig3") //$NON-NLS-1$ ), }; final static IFormData FILE_FORM_DEFINITION = new FormData( - "FileHibConfig3", new String[]{null}, FILE_DEFINITIONS); + "FileHibConfig3", new String[]{null}, FILE_DEFINITIONS); //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,23 +18,23 @@ * @author glory */ public class HibConfig3MappingFormLayoutData { - static String MAPPING_ENTITY = "HibConfig3Mapping"; + static String MAPPING_ENTITY = "HibConfig3Mapping"; //$NON-NLS-1$ final static IFormData MAPPING_LIST_DEFINITION = new FormData( "Mappings", - "", //Description - "Mappings", - new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, + "", //Description //$NON-NLS-1$ + "Mappings", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$ new String[]{MAPPING_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") //$NON-NLS-1$ ); final static IFormData MAPPING_FOLDER_DEFINITION = new FormData( "Mappings", - "", //"Description - "HibConfig3MappingsFolder", - new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, + "", //"Description //$NON-NLS-1$ + "HibConfig3MappingsFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$ new String[]{MAPPING_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") //$NON-NLS-1$ ); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,24 +18,24 @@ * @author glory */ public class HibConfig3PropertyFormLayoutData { - static String PROPERTY_ENTITY = "HibConfig3Property"; + static String PROPERTY_ENTITY = "HibConfig3Property"; //$NON-NLS-1$ final static IFormData PROPERTY_LIST_DEFINITION = new FormData( "Properties", - "", //Description - "Properties", - new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, + "", //Description //$NON-NLS-1$ + "Properties", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$ new String[]{PROPERTY_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") //$NON-NLS-1$ ); final static IFormData PROPERTY_FOLDER_DEFINITION = new FormData( "Properties", - "", //"Description - "HibConfig3PropertiesFolder", - new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, + "", //"Description //$NON-NLS-1$ + "HibConfig3PropertiesFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$ new String[]{PROPERTY_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") //$NON-NLS-1$ ); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -22,13 +22,13 @@ new IFormData[] { new FormData( "Session Factory", - "", //"Description - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("HibConfig3SessionFactory") + "", //"Description //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("HibConfig3SessionFactory") //$NON-NLS-1$ ), HibConfig3PropertyFormLayoutData.PROPERTY_LIST_DEFINITION, HibConfig3MappingFormLayoutData.MAPPING_LIST_DEFINITION, }; final static IFormData SESSION_FACTORY_FORM_DEFINITION = new FormData( - "HibConfig3SessionFactory", new String[]{null}, SESSION_FACTORY_DEFINITIONS); + "HibConfig3SessionFactory", new String[]{null}, SESSION_FACTORY_DEFINITIONS); //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,21 +18,21 @@ * @author glory */ public class Hibernate3AnyFormLayoutData { - static String ANY_ENTITY = "Hibernate3Any"; - static String META_VALUE_ENTITY = "Hibernate3MetaValue"; + static String ANY_ENTITY = "Hibernate3Any"; //$NON-NLS-1$ + static String META_VALUE_ENTITY = "Hibernate3MetaValue"; //$NON-NLS-1$ static IFormData META_VALUE_LIST_DEFINITION = new FormData( "Meta Values", - "", //"Description - new FormAttributeData[]{new FormAttributeData("value", 50), new FormAttributeData("class", 50)}, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("value", 50), new FormAttributeData("class", 50)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{META_VALUE_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMetaValue") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMetaValue") //$NON-NLS-1$ ); final static IFormData[] ANY_DEFINITIONS = new IFormData[] { new FormData( "Any", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ANY_ENTITY) ), META_VALUE_LIST_DEFINITION, @@ -40,7 +40,7 @@ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ANY_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ClassFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ClassFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ClassFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,82 +18,83 @@ * @author glory */ public class Hibernate3ClassFormLayoutData { - static String CLASS_ENTITY = "Hibernate3Class"; - static String SUBCLASS_ENTITY = "Hibernate3Subclass"; - static String JOIN_ENTITY = "Hibernate3Join"; - static String JOINED_SUBCLASS_ENTITY = "Hibernate3JoinedSubclass"; - static String ALL_SUBCLASSES_ENTITY = "Hibernate3AllSubclassFolder"; - static String SUBCLASSES_ENTITY = "Hibernate3SubclassFolder"; - static String JOINED_SUBCLASSES_ENTITY = "Hibernate3JoinedSubclassFolder"; + static String CLASS_ENTITY = "Hibernate3Class"; //$NON-NLS-1$ + static String SUBCLASS_ENTITY = "Hibernate3Subclass"; //$NON-NLS-1$ + static String JOIN_ENTITY = "Hibernate3Join"; //$NON-NLS-1$ + static String JOINED_SUBCLASS_ENTITY = "Hibernate3JoinedSubclass"; //$NON-NLS-1$ + static String ALL_SUBCLASSES_ENTITY = "Hibernate3AllSubclassFolder"; //$NON-NLS-1$ + static String SUBCLASSES_ENTITY = "Hibernate3SubclassFolder"; //$NON-NLS-1$ + static String JOINED_SUBCLASSES_ENTITY = "Hibernate3JoinedSubclassFolder"; //$NON-NLS-1$ static IFormData ALL_SUBCLASSES_LIST_DEFINITION = new FormData( "Subclasses", - "", //Description - "Subclasses", - new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, + "", //Description //$NON-NLS-1$ + "Subclasses", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(ALL_SUBCLASSES_ENTITY, "details"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ); static IFormData ALL_SUBCLASSES_FOLDER_DEFINITION = new FormData( "Subclasses", - "", //Description + "", //Description //$NON-NLS-1$ ALL_SUBCLASSES_ENTITY, - new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, + new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(ALL_SUBCLASSES_ENTITY, "details"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ); static IFormData SUBCLASSES_LIST_DEFINITION = new FormData( "Subclasses", - "", //Description - "Subclasses", - new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, + "", //Description //$NON-NLS-1$ + "Subclasses", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(SUBCLASSES_ENTITY, "details"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ); static IFormData SUBCLASSES_FOLDER_DEFINITION = new FormData( "Subclasses", - "", //Description + "", //Description //$NON-NLS-1$ SUBCLASSES_ENTITY, - new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, + new FormAttributeData[]{new FormAttributeData("details", 100, "subclass info")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(SUBCLASSES_ENTITY, "details"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ); static IFormData JOINED_SUBCLASSES_LIST_DEFINITION = new FormData( "Subclasses", - "", //Description - "Subclasses", - new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, + "", //Description //$NON-NLS-1$ + "Subclasses", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(JOINED_SUBCLASSES_ENTITY, "name"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddJoinedSubclass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddJoinedSubclass") //$NON-NLS-1$ ); static IFormData JOINED_SUBCLASSES_FOLDER_DEFINITION = new FormData( "Subclasses", - "", //Description + "", //Description //$NON-NLS-1$ JOINED_SUBCLASSES_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, + new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(JOINED_SUBCLASSES_ENTITY, "name"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddJoinedSubclass") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddJoinedSubclass") //$NON-NLS-1$ ); private final static IFormData[] CLASS_DEFINITIONS = new IFormData[] { new FormData( "Class", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(CLASS_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ALL_SUBCLASSES_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION, Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(CLASS_ENTITY) ), }; @@ -105,16 +106,17 @@ private final static IFormData[] SUBCLASS_DEFINITIONS = new IFormData[] { new FormData( "Subclass", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(SUBCLASS_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ SUBCLASSES_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_FOLDER_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(SUBCLASS_ENTITY) ), }; @@ -126,14 +128,15 @@ private final static IFormData[] JOIN_DEFINITIONS = new IFormData[] { new FormData( "Join", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(JOIN_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesJFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesJFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(JOIN_ENTITY) ), }; @@ -145,16 +148,17 @@ private final static IFormData[] JOINED_SUBCLASS_DEFINITIONS = new IFormData[] { new FormData( "Joined Subclass", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(JOINED_SUBCLASS_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesCFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ JOINED_SUBCLASSES_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(JOINED_SUBCLASS_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -21,10 +21,10 @@ final static IFormData COLUMN_LIST_DEFINITION = new FormData( "Columns", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 50), new FormAttributeData("sql-type", 50)}, - new String[]{"Hibernate3Column"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddColumn") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 50), new FormAttributeData("sql-type", 50)}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[]{"Hibernate3Column"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddColumn") //$NON-NLS-1$ ); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ComponentFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ComponentFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ComponentFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,20 +17,21 @@ * @author glory */ public class Hibernate3ComponentFormLayoutData { - static String COMPONENT_ENTITY = "Hibernate3Component"; - static String DYNAMIC_COMPONENT_ENTITY = "Hibernate3DynamicComponent"; + static String COMPONENT_ENTITY = "Hibernate3Component"; //$NON-NLS-1$ + static String DYNAMIC_COMPONENT_ENTITY = "Hibernate3DynamicComponent"; //$NON-NLS-1$ final static IFormData[] COMPONENT_DEFINITIONS = new IFormData[] { new FormData( "Component", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPONENT_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COMPONENT_ENTITY) ), }; @@ -42,13 +43,14 @@ final static IFormData[] DYNAMIC_COMPONENT_DEFINITIONS = new IFormData[] { new FormData( "Dynamic Component", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(DYNAMIC_COMPONENT_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COMPONENT_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3CompositeElementFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3CompositeElementFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3CompositeElementFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -14,20 +14,21 @@ import org.jboss.tools.common.model.ui.forms.IFormData; public class Hibernate3CompositeElementFormLayoutData { - static String ELEMENT_ENTITY = "Hibernate3CompositeElement"; - static String NESTED_ELEMENT_ENTITY = "Hibernate3NestedCompositeElement"; + static String ELEMENT_ENTITY = "Hibernate3CompositeElement"; //$NON-NLS-1$ + static String NESTED_ELEMENT_ENTITY = "Hibernate3NestedCompositeElement"; //$NON-NLS-1$ final static IFormData[] ELEMENT_DEFINITIONS = new IFormData[] { new FormData( "Composite Element", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ELEMENT_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesNestedFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesNestedFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ELEMENT_ENTITY) ) }; @@ -39,14 +40,15 @@ final static IFormData[] NESTED_ELEMENT_DEFINITIONS = new IFormData[] { new FormData( "Composite Element", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(NESTED_ELEMENT_ENTITY) ), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesNestedFolder", "Properties", "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesNestedFolder", "Properties", "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(NESTED_ELEMENT_ENTITY) ) }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3DatabaseObjectFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3DatabaseObjectFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3DatabaseObjectFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -16,31 +16,31 @@ import org.jboss.tools.common.model.ui.forms.IFormData; public class Hibernate3DatabaseObjectFormLayoutData { - static String DATABASE_OBJECT_DEF_ENTITY = "Hibernate3DatabaseObjectDef"; - static String DATABASE_OBJECT_CD_ENTITY = "Hibernate3DatabaseObjectCreateDrop"; - static String DIALECT_SCOPE_ENTITY = "Hibernate3DialectScope"; - static String DATABASE_FOLDER_ENTITY = "Hibernate3DatabaseObjectFolder"; + static String DATABASE_OBJECT_DEF_ENTITY = "Hibernate3DatabaseObjectDef"; //$NON-NLS-1$ + static String DATABASE_OBJECT_CD_ENTITY = "Hibernate3DatabaseObjectCreateDrop"; //$NON-NLS-1$ + static String DIALECT_SCOPE_ENTITY = "Hibernate3DialectScope"; //$NON-NLS-1$ + static String DATABASE_FOLDER_ENTITY = "Hibernate3DatabaseObjectFolder"; //$NON-NLS-1$ final static IFormData DIALECT_SCOPE_LIST_DEFINITION = new FormData( "Dialect Scopes", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{DIALECT_SCOPE_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddDialectScope") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddDialectScope") //$NON-NLS-1$ ); final static IFormData DATABASE_OBJECT_LIST_DEFINITION = new FormData( "Database Objects", - "", //"Description - new FormAttributeData[]{new FormAttributeData("presentation", 100, "database object")}, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("presentation", 100, "database object")}, //$NON-NLS-1$ new String[]{DATABASE_OBJECT_DEF_ENTITY, DATABASE_OBJECT_CD_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddDatabaseObject") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddDatabaseObject") //$NON-NLS-1$ ); final static IFormData[] DATABASE_OBJECT_DEF_DEFINITIONS = new IFormData[] { new FormData( "Database Object", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(DATABASE_OBJECT_DEF_ENTITY) ), DIALECT_SCOPE_LIST_DEFINITION, @@ -49,11 +49,11 @@ final static IFormData[] DATABASE_OBJECT_CD_DEFINITIONS = new IFormData[] { new FormData( "Database Object", - "", //"Description + "", //"Description //$NON-NLS-1$ // Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(DATABASE_OBJECT_CD_ENTITY) new IFormAttributeData[]{ - new FormAttributeData("create", null, Hibernate3FormLayoutDataUtil.SBFEE_CLASS_NAME), - new FormAttributeData("drop", null, Hibernate3FormLayoutDataUtil.SBFEE_CLASS_NAME), + new FormAttributeData("create", null, Hibernate3FormLayoutDataUtil.SBFEE_CLASS_NAME), //$NON-NLS-1$ + new FormAttributeData("drop", null, Hibernate3FormLayoutDataUtil.SBFEE_CLASS_NAME), //$NON-NLS-1$ } ), DIALECT_SCOPE_LIST_DEFINITION, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ElementFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ElementFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ElementFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -14,21 +14,21 @@ import org.jboss.tools.common.model.ui.forms.IFormData; public class Hibernate3ElementFormLayoutData { - static String ELEMENT_ENTITY = "Hibernate3Element"; - static String MANY_TO_MANY_ENTITY = "Hibernate3ManyToMany"; - static String MANY_TO_ANY_ENTITY = "Hibernate3ManyToAny"; + static String ELEMENT_ENTITY = "Hibernate3Element"; //$NON-NLS-1$ + static String MANY_TO_MANY_ENTITY = "Hibernate3ManyToMany"; //$NON-NLS-1$ + static String MANY_TO_ANY_ENTITY = "Hibernate3ManyToAny"; //$NON-NLS-1$ final static IFormData[] ELEMENT_DEFINITIONS = new IFormData[] { new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ELEMENT_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ELEMENT_ENTITY) ) }; @@ -40,7 +40,7 @@ final static IFormData[] MANY_TO_MANY_DEFINITIONS = new IFormData[] { new FormData( "Many To Many", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MANY_TO_MANY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, @@ -49,7 +49,7 @@ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MANY_TO_MANY_ENTITY) ) }; @@ -61,7 +61,7 @@ final static IFormData[] MANY_TO_ANY_DEFINITIONS = new IFormData[] { new FormData( "Many To Any", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MANY_TO_ANY_ENTITY) ), Hibernate3AnyFormLayoutData.META_VALUE_LIST_DEFINITION, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FileFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FileFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FileFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -23,57 +23,65 @@ new IFormData[] { new FormData( "File Hibernate 3.0", - "", //"Description - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("FileHibernate3") + "", //"Description //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("FileHibernate3") //$NON-NLS-1$ ), new FormData( "Advanced", - "", //"Description - Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData("FileHibernate3") + "", //"Description //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData("FileHibernate3") //$NON-NLS-1$ ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Types", - "", //Description - "Types", - new FormAttributeData[]{new FormAttributeData("name", 30, "name"), new FormAttributeData("class", 70, "class")}, - new String[]{"Hibernate3Typedef"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") + "", //Description //$NON-NLS-1$ + "Types", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("name", 30, "name"), //$NON-NLS-1$ + new FormAttributeData("class", 70, "class")}, //$NON-NLS-1$ + new String[]{"Hibernate3Typedef"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") //$NON-NLS-1$ ), new FormData( "Imports", - "", //Description - "Imports", - new FormAttributeData[]{new FormAttributeData("class", 60, "class"), new FormAttributeData("rename", 40, "rename")}, - new String[]{"Hibernate3Import"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddImport") + "", //Description //$NON-NLS-1$ + "Imports", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("class", 60, "class"), //$NON-NLS-1$ + new FormAttributeData("rename", 40, "rename")}, //$NON-NLS-1$ + new String[]{"Hibernate3Import"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddImport") //$NON-NLS-1$ ), new FormData( "Classes", - "", //Description - "Classes", - new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, - new String[]{"Hibernate3Class", "Hibernate3Subclass", "Hibernate3JoinedSubclass", "Hibernate3UnionSubclass"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + "", //Description //$NON-NLS-1$ + "Classes", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, //$NON-NLS-1$ + new String[]{"Hibernate3Class", "Hibernate3Subclass", "Hibernate3JoinedSubclass", "Hibernate3UnionSubclass"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ), new FormData( "Queries", - "", //"Description - "Queries", - new FormAttributeData[]{new FormAttributeData("name", 30, "name"), new FormAttributeData("query", 70, "query")}, - new String[]{"Hibernate3Query", "Hibernate3SQLQuery"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyQuery") + "", //"Description //$NON-NLS-1$ + "Queries", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("name", 30, "name"), //$NON-NLS-1$ + new FormAttributeData("query", 70, "query")}, //$NON-NLS-1$ + new String[]{"Hibernate3Query", "Hibernate3SQLQuery"}, //$NON-NLS-1$ //$NON-NLS-2$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyQuery") //$NON-NLS-1$ ), new FormData( "Filters", - "", //"Description - "Filters", - new FormAttributeData[]{new FormAttributeData("name", 30, "name"), new FormAttributeData("value", 70, "value")}, - new String[]{"Hibernate3Filterdef"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilterdef") + "", //"Description //$NON-NLS-1$ + "Filters", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("name", 30, "name"), //$NON-NLS-1$ + new FormAttributeData("value", 70, "value")}, //$NON-NLS-1$ + new String[]{"Hibernate3Filterdef"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilterdef") //$NON-NLS-1$ ), }; final static IFormData FILE_FORM_DEFINITION = new FormData( - "FileHibernate3", new String[]{null}, FILE_DEFINITIONS); + "FileHibernate3", new String[]{null}, FILE_DEFINITIONS); //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FilterFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FilterFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FilterFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,51 +18,51 @@ * @author glory */ public class Hibernate3FilterFormLayoutData { - static String FILTER_ENTITY = "Hibernate3Filter"; - static String FILTER_FOLDER_ENTITY = "Hibernate3FilterFolder"; - static String FILTERDEF_ENTITY = "Hibernate3Filterdef"; - static String FILTERDEF_FOLDER_ENTITY = "Hibernate3FilterdefFolder"; - static String TYPEDEF_ENTITY = "Hibernate3Typedef"; + static String FILTER_ENTITY = "Hibernate3Filter"; //$NON-NLS-1$ + static String FILTER_FOLDER_ENTITY = "Hibernate3FilterFolder"; //$NON-NLS-1$ + static String FILTERDEF_ENTITY = "Hibernate3Filterdef"; //$NON-NLS-1$ + static String FILTERDEF_FOLDER_ENTITY = "Hibernate3FilterdefFolder"; //$NON-NLS-1$ + static String TYPEDEF_ENTITY = "Hibernate3Typedef"; //$NON-NLS-1$ final static IFormData FILTER_LIST_DEFINITION = new FormData( "Filters", - "", //Description - "Filters", - new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, + "", //Description //$NON-NLS-1$ + "Filters", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$ new String[]{FILTER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilter") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilter") //$NON-NLS-1$ ); final static IFormData FILTER_FOLDER_DEFINITION = new FormData( "Filters", - "", //"Description + "", //"Description //$NON-NLS-1$ FILTER_FOLDER_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, + new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$ new String[]{FILTER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilter") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilter") //$NON-NLS-1$ ); final static IFormData FILTERDEF_FOLDER_DEFINITION = new FormData( "Filters", - "", //"Description + "", //"Description //$NON-NLS-1$ FILTERDEF_FOLDER_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, + new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$ new String[]{FILTERDEF_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilterdef") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFilterdef") //$NON-NLS-1$ ); private final static IFormData PARAMETERS = new FormData( "Parameters", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("type", 70)}, - new String[]{"Hibernate3FilterParam"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddParam") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("type", 70)}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[]{"Hibernate3FilterParam"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddParam") //$NON-NLS-1$ ); private final static IFormData[] FILTERDEF_DEFINITIONS = new IFormData[] { new FormData( "Filter Definition", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(FILTERDEF_ENTITY) ), PARAMETERS @@ -75,7 +75,7 @@ private final static IFormData[] TYPEDEF_DEFINITIONS = new IFormData[] { new FormData( "Type Definition", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(TYPEDEF_ENTITY) ), PARAMETERS Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -74,35 +74,41 @@ new FormData( "Types", - "", //"Description - "Hibernate3TypedefFolder", - new FormAttributeData[]{new FormAttributeData("name", 30, "name"), new FormAttributeData("class", 70, "class")}, - new String[]{"Hibernate3Typedef"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") + "", //"Description //$NON-NLS-1$ + "Hibernate3TypedefFolder", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("name", 30, "name"), //$NON-NLS-1$ + new FormAttributeData("class", 70, "class")}, //$NON-NLS-1$ + new String[]{"Hibernate3Typedef"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") //$NON-NLS-1$ ), new FormData( "Imports", - "", //"Description - "Hibernate3ImportFolder", - new FormAttributeData[]{new FormAttributeData("class", 60, "class"), new FormAttributeData("rename", 40, "rename")}, - new String[]{"Hibernate3Import"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") + "", //"Description //$NON-NLS-1$ + "Hibernate3ImportFolder", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("class", 60, "class"), //$NON-NLS-1$ + new FormAttributeData("rename", 40, "rename")}, //$NON-NLS-1$ + new String[]{"Hibernate3Import"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTypedef") //$NON-NLS-1$ ), new FormData( "Classes", - "", //"Description - "Hibernate3ClassFolder", - new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, - Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute("Hibernate3ClassFolder", "name"), - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") + "", //"Description //$NON-NLS-1$ + "Hibernate3ClassFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100, "class name")}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute("Hibernate3ClassFolder", "name"), //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyClass") //$NON-NLS-1$ ), new FormData( "Queries", - "", //"Description - "Hibernate3QueryFolder", - new FormAttributeData[]{new FormAttributeData("name", 30, "name"), new FormAttributeData("query", 70, "query")}, - new String[]{"Hibernate3Query", "Hibernate3SQLQuery"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyQuery") + "", //"Description //$NON-NLS-1$ + "Hibernate3QueryFolder", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("name", 30, "name"), //$NON-NLS-1$ + new FormAttributeData("query", 70, "query")}, //$NON-NLS-1$ + new String[]{"Hibernate3Query", "Hibernate3SQLQuery"}, //$NON-NLS-1$ //$NON-NLS-2$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyQuery") //$NON-NLS-1$ ), Hibernate3FilterFormLayoutData.FILTER_FOLDER_DEFINITION, @@ -113,11 +119,16 @@ Hibernate3FilterFormLayoutData.FILTERDEF_DEFINITION, Hibernate3FilterFormLayoutData.TYPEDEF_DEFINITION, - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesCFolder", null, "name", "CreateActions.AddAttribute"), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesFolder", null, "name", "CreateActions.AddAttribute"), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesJFolder", null, "name", "CreateActions.AddAttribute"), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesPFolder", null, "name", "CreateActions.AddAttribute"), - Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", "Hibernate3AttributesNestedFolder", null, "name", "CreateActions.AddAttribute"), + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesCFolder", null, "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesFolder", null, "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesJFolder", null, "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesPFolder", null, "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createAllChildrenFormData("Properties", + "Hibernate3AttributesNestedFolder", null, "name", "CreateActions.AddAttribute"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Hibernate3DatabaseObjectFormLayoutData.DATABASE_OBJECT_CD_DEFINITION, Hibernate3DatabaseObjectFormLayoutData.DATABASE_OBJECT_DEF_DEFINITION, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -29,22 +29,36 @@ * @author glory */ public class Hibernate3FormLayoutDataUtil { - private final static String STBFE_CLASS_NAME = "org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor"; - public final static String SBFEE_CLASS_NAME = "org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx"; + private final static String STBFE_CLASS_NAME = "org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor"; //$NON-NLS-1$ + public final static String SBFEE_CLASS_NAME = "org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx"; //$NON-NLS-1$ - private final static String SELECT_IT_ACTION = "%SelectIt%"; - private final static String INTERNAL_ACTION = "%internal%"; - private final static String DEFAULT_DELETE_ACTION = "DeleteActions.Delete"; + private final static String SELECT_IT_ACTION = "%SelectIt%"; //$NON-NLS-1$ + private final static String INTERNAL_ACTION = "%internal%"; //$NON-NLS-1$ + private final static String DEFAULT_DELETE_ACTION = "DeleteActions.Delete"; //$NON-NLS-1$ // private final static String DEFAULT_EDIT_ACTION = "Properties.Properties"; + /** + * (non-translatable) + */ public static IFormAttributeData[] createGeneralFormAttributeData(String entityName) { return createFormAttributeData(entityName, "general"); } + /** + * + * @param entityName (non-translatable) + * @return + */ public static IFormAttributeData[] createAdvancedFormAttributeData(String entityName) { return createFormAttributeData(entityName, "advanced"); } + /** + * + * @param entityName (non-translatable) + * @param categoryName + * @return + */ public static IFormAttributeData[] createFormAttributeData(String entityName, String categoryName) { XModelEntity entity = PreferenceModelUtilities.getPreferenceModel().getMetaData().getEntity(entityName); if(entity == null) return new IFormAttributeData[0]; @@ -52,12 +66,12 @@ XAttribute[] as = entity.getAttributes(); for (int i = 0; i < as.length; i++) { if(!as[i].isVisible()) continue; - String category = as[i].getProperty("category"); + String category = as[i].getProperty("category"); //$NON-NLS-1$ if(category != null && category.equals(categoryName)) { String editorName = as[i].getEditor().getName(); - if("AccessibleJava".equals(editorName)) { + if("AccessibleJava".equals(editorName)) { //$NON-NLS-1$ list.add(new FormAttributeData(as[i].getName(), null, STBFE_CLASS_NAME)); - } else if("Note".equals(editorName)) { + } else if("Note".equals(editorName)) { //$NON-NLS-1$ list.add(new FormAttributeData(as[i].getName(), InfoLayoutDataFactory.getInstance())); } else { list.add(new FormAttributeData(as[i].getName())); @@ -67,6 +81,12 @@ return (IFormAttributeData[])list.toArray(new IFormAttributeData[0]); } + /** + * + * @param entityName (non-translatable) + * @param attributeName (non-translatable) + * @return + */ public static String[] getChildEntitiesWithAttribute(String entityName, String attributeName) { XModelEntity entity = PreferenceModelUtilities.getPreferenceModel().getMetaData().getEntity(entityName); if(entity == null) return new String[0]; @@ -79,15 +99,34 @@ return list.toArray(new String[0]); } + /** + * + * @param name (translatable) + * @param entityName (non-translatable) + * @param childName (non-translatable) + * @param attributeName (non-translatable) + * @param createAction (non-translatable) + * @return + */ public static FormData createAllChildrenFormData(String name, String entityName, String childName, String attributeName, String createAction) { return createChildrenFormData(name, entityName, childName, attributeName, Hibernate3FormLayoutDataUtil.getChildEntitiesWithAttribute(entityName, attributeName), createAction); } + /** + * + * @param name (translatable) + * @param entityName (non-translatable) + * @param childName (non-translatable) + * @param attributeName (non-translatable) + * @param entityNames (non-translatable) + * @param createAction (non-translatable) + * @return + */ public static FormData createChildrenFormData(String name, String entityName, String childName, String attributeName, String[] entityNames, String createAction) { return new FormData( name, - "", //"Description + "", //"Description //$NON-NLS-1$ childName != null ? childName : entityName, new FormAttributeData[]{new FormAttributeData(attributeName, 100, attributeName)}, entityNames, @@ -95,6 +134,11 @@ ); } + /** + * + * @param actionPath (non-translatable) + * @return + */ public static IFormActionData[] createDefaultFormActionData(String actionPath) { return new IFormActionData[] { new FormActionData(TableStructuredEditor.ADD_ACTION, actionPath), Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -19,21 +19,21 @@ * @author glory */ public class Hibernate3FormulaFormLayoutData { - static String FORMULA_ENTITY = "Hibernate3Formula"; + static String FORMULA_ENTITY = "Hibernate3Formula"; //$NON-NLS-1$ static IFormData FORMULA_LIST_DEFINITION = new FormData( "Formulas", - "", //"Description - new FormAttributeData[]{new FormAttributeData("value", 100)}, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("value", 100)}, //$NON-NLS-1$ new String[]{FORMULA_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFormula") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFormula") //$NON-NLS-1$ ); static IFormData FORMULA_DEFINITION = new FormData( "Formula", - "", //"Description + "", //"Description //$NON-NLS-1$ FORMULA_ENTITY, - new FormAttributeData[]{new FormAttributeData("value", GreedyLayoutDataFactory.getInstance())} + new FormAttributeData[]{new FormAttributeData("value", GreedyLayoutDataFactory.getInstance())} //$NON-NLS-1$ ); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,21 +17,24 @@ * @author glory */ public class Hibernate3IdFormLayoutData { - static String COMPOSITE_ID_ENTITY = "Hibernate3CompositeId"; - static String COMPOSITE_INDEX_ENTITY = "Hibernate3CompositeIndex"; - static String COLLECTION_ID_ENTITY = "Hibernate3CollectionId"; + static String COMPOSITE_ID_ENTITY = "Hibernate3CompositeId"; //$NON-NLS-1$ + static String COMPOSITE_INDEX_ENTITY = "Hibernate3CompositeIndex"; //$NON-NLS-1$ + static String COLLECTION_ID_ENTITY = "Hibernate3CollectionId"; //$NON-NLS-1$ final static IFormData[] COMPOSITE_ID_DEFINITIONS = new IFormData[] { new FormData( "Composite ID", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_ID_ENTITY) ), - Hibernate3FormLayoutDataUtil.createChildrenFormData("Key Properties", null, null, "name", new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), + Hibernate3FormLayoutDataUtil.createChildrenFormData( + "Key Properties", null, null, + "name", //$NON-NLS-1$ + new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COMPOSITE_ID_ENTITY) ), }; @@ -43,14 +46,14 @@ final static IFormData[] COLLECTION_ID_DEFINITIONS = new IFormData[] { new FormData( "Collection ID", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COLLECTION_ID_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COLLECTION_ID_ENTITY) ), }; @@ -62,10 +65,13 @@ final static IFormData[] COMPOSITE_INDEX_DEFINITIONS = new IFormData[] { new FormData( "Composite Index", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_INDEX_ENTITY) ), - Hibernate3FormLayoutDataUtil.createChildrenFormData("Key Properties", null, null, "name", new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), + Hibernate3FormLayoutDataUtil.createChildrenFormData( + "Key Properties", null, null, + "name", //$NON-NLS-1$ + new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; static IFormData COMPOSITE_INDEX_DEFINITION = new FormData( Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,28 +17,28 @@ * @author glory */ public class Hibernate3KeyFormLayoutData { - static String KEY_ENTITY = "Hibernate3Key"; - static String KEY_MANY_TO_ONE_ENTITY = "Hibernate3KeyManyToOne"; - static String KEY_PROPERTY_ENTITY = "Hibernate3KeyProperty"; + static String KEY_ENTITY = "Hibernate3Key"; //$NON-NLS-1$ + static String KEY_MANY_TO_ONE_ENTITY = "Hibernate3KeyManyToOne"; //$NON-NLS-1$ + static String KEY_PROPERTY_ENTITY = "Hibernate3KeyProperty"; //$NON-NLS-1$ - static String MAP_KEY_ENTITY = "Hibernate3MapKey"; - static String MAP_KEY_MANY_TO_MANY_ENTITY = "Hibernate3MapKeyManyToMany"; - static String COMPOSITE_MAP_KEY_ENTITY = "Hibernate3CompositeMapKey"; + static String MAP_KEY_ENTITY = "Hibernate3MapKey"; //$NON-NLS-1$ + static String MAP_KEY_MANY_TO_MANY_ENTITY = "Hibernate3MapKeyManyToMany"; //$NON-NLS-1$ + static String COMPOSITE_MAP_KEY_ENTITY = "Hibernate3CompositeMapKey"; //$NON-NLS-1$ - static String INDEX_ENTITY = "Hibernate3Index"; - static String LIST_INDEX_ENTITY = "Hibernate3ListIndex"; + static String INDEX_ENTITY = "Hibernate3Index"; //$NON-NLS-1$ + static String LIST_INDEX_ENTITY = "Hibernate3ListIndex"; //$NON-NLS-1$ final static IFormData[] KEY_DEFINITIONS = new IFormData[] { new FormData( "Key", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, // Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_ENTITY) ), }; @@ -50,14 +50,14 @@ final static IFormData[] KEY_MANY_TO_ONE_DEFINITIONS = new IFormData[] { new FormData( "Key Many To One", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_MANY_TO_ONE_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_MANY_TO_ONE_ENTITY) ), }; @@ -69,14 +69,14 @@ final static IFormData[] KEY_PROPERTY_DEFINITIONS = new IFormData[] { new FormData( "Key Property", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_PROPERTY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_PROPERTY_ENTITY) ), }; @@ -88,14 +88,14 @@ final static IFormData[] MAP_KEY_DEFINITIONS = new IFormData[] { new FormData( "Map Key", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_KEY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_KEY_ENTITY) ), }; @@ -107,14 +107,14 @@ final static IFormData[] MAP_KEY_MANY_TO_MANY_DEFINITIONS = new IFormData[] { new FormData( "Map Key Many To Many", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_KEY_MANY_TO_MANY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_KEY_MANY_TO_MANY_ENTITY) ), }; @@ -126,10 +126,11 @@ final static IFormData[] COMPOSITE_MAP_KEY_DEFINITIONS = new IFormData[] { new FormData( "Composite Map key", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_MAP_KEY_ENTITY) ), - Hibernate3FormLayoutDataUtil.createChildrenFormData("Key Properties", null, null, "name", new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), + Hibernate3FormLayoutDataUtil.createChildrenFormData("Key Properties", + null, null, "name", new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ }; static IFormData COMPOSITE_MAP_KEY_DEFINITION = new FormData( Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -16,40 +16,40 @@ import org.jboss.tools.common.model.ui.forms.IFormData; public class Hibernate3ListFormLayoutData { - static String LIST_ENTITY = "Hibernate3List"; - static String ARRAY_ENTITY = "Hibernate3Array"; + static String LIST_ENTITY = "Hibernate3List"; //$NON-NLS-1$ + static String ARRAY_ENTITY = "Hibernate3Array"; //$NON-NLS-1$ final static IFormData[] LIST_DEFINITIONS = new IFormData[] { new FormData( "List", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(LIST_ENTITY) ), new FormData( "Key", - "", - "key", - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") + "", //$NON-NLS-1$ + "key", //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$ ), new FormData( "Index", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("index", 100, "Index Kind") + new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$ } ), new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("element", 100, "Element Kind") + new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$ } ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(LIST_ENTITY) ), }; @@ -57,34 +57,34 @@ final static IFormData[] ARRAY_DEFINITIONS = new IFormData[] { new FormData( "Array", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ARRAY_ENTITY) ), new FormData( "Key", - "", - "key", - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") + "", //$NON-NLS-1$ + "key", //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$ ), new FormData( "Index", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("index", 100, "Index Kind") + new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$ } ), new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("element", 100, "Element Kind") + new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$ } ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ARRAY_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,12 +17,12 @@ * @author glory */ public class Hibernate3ManyToOneFormLayoutData { - static String MANY_TO_ONE_ENTITY = "Hibernate3ManyToOne"; + static String MANY_TO_ONE_ENTITY = "Hibernate3ManyToOne"; //$NON-NLS-1$ final static IFormData[] MANY_TO_ONE_DEFINITIONS = new IFormData[] { new FormData( "Many To One", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MANY_TO_ONE_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, @@ -30,7 +30,7 @@ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MANY_TO_ONE_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -21,27 +21,27 @@ final static IFormData[] MAP_DEFINITIONS = new IFormData[] { new FormData( "Map", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_ENTITY) ), new FormData( "Key", - "", - "key", + "", //$NON-NLS-1$ + "key", //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") ), new FormData( "Index", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("index", 100, "Index Kind") + new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$ } ), new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("element", 100, "Element Kind") + new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$ } ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, @@ -49,7 +49,7 @@ Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,41 +18,45 @@ * @author glory */ public class Hibernate3MetaFormLayoutData { - static String META_ENTITY = "Hibernate3Meta"; - static String TUPLIZER_ENTITY = "Hibernate3Tuplizer"; + static String META_ENTITY = "Hibernate3Meta"; //$NON-NLS-1$ + static String TUPLIZER_ENTITY = "Hibernate3Tuplizer"; //$NON-NLS-1$ final static IFormData META_LIST_DEFINITION = new FormData( "Meta", - "", //Description - "Meta", - new FormAttributeData[]{new FormAttributeData("attribute", 30, "attribute"), new FormAttributeData("value", 70, "value")}, + "", //Description //$NON-NLS-1$ + "Meta", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("attribute", 30, "attribute"), //$NON-NLS-1$ + new FormAttributeData("value", 70, "value")}, //$NON-NLS-1$ new String[]{META_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") //$NON-NLS-1$ ); final static IFormData META_FOLDER_DEFINITION = new FormData( "Meta", - "", //"Description - "Hibernate3MetaFolder", - new FormAttributeData[]{new FormAttributeData("attribute", 30, "attribute"), new FormAttributeData("value", 70, "value")}, + "", //"Description //$NON-NLS-1$ + "Hibernate3MetaFolder", //$NON-NLS-1$ + new FormAttributeData[]{ + new FormAttributeData("attribute", 30, "attribute"), //$NON-NLS-1$ + new FormAttributeData("value", 70, "value")}, //$NON-NLS-1$ new String[]{META_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") //$NON-NLS-1$ ); final static IFormData TUPLIZER_LIST_DEFINITION = new FormData( "Tuplizers", - "", //"Description - "Tuplizers", - new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, + "", //"Description //$NON-NLS-1$ + "Tuplizers", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, //$NON-NLS-1$ new String[]{TUPLIZER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") //$NON-NLS-1$ ); final static IFormData TUPLIZER_FOLDER_DEFINITION = new FormData( "Tuplizers", - "", //"Description - "Hibernate3TuplizerFolder", - new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, + "", //"Description //$NON-NLS-1$ + "Hibernate3TuplizerFolder", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, //$NON-NLS-1$ new String[]{TUPLIZER_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") //$NON-NLS-1$ ); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,18 +17,18 @@ * @author glory */ public class Hibernate3OneToOneFormLayoutData { - static String ONE_TO_ONE_ENTITY = "Hibernate3OneToOne"; + static String ONE_TO_ONE_ENTITY = "Hibernate3OneToOne"; //$NON-NLS-1$ final static IFormData[] ONE_TO_ONE_DEFINITIONS = new IFormData[] { new FormData( "One To One", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ONE_TO_ONE_ENTITY) ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ONE_TO_ONE_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -17,11 +17,11 @@ * @author glory */ public class Hibernate3PropertyFormLayoutData { - static String PROPERTY_ENTITY = "Hibernate3Property"; + static String PROPERTY_ENTITY = "Hibernate3Property"; //$NON-NLS-1$ final static IFormData[] PROPERTY_DEFINITIONS = new IFormData[] { new FormData( "Property", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(PROPERTY_ENTITY) ), Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION, @@ -29,7 +29,7 @@ Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(PROPERTY_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -18,51 +18,51 @@ * @author glory */ public class Hibernate3SQLQueryFormLayoutData { - static String SQL_QUERY_ENTITY = "Hibernate3SQLQuery"; - static String SYNCHRONIZES_ENTITY = "Hibernate3Synchronize"; - static String RESULT_SET_ENTITY = "Hibernate3ResultSet"; + static String SQL_QUERY_ENTITY = "Hibernate3SQLQuery"; //$NON-NLS-1$ + static String SYNCHRONIZES_ENTITY = "Hibernate3Synchronize"; //$NON-NLS-1$ + static String RESULT_SET_ENTITY = "Hibernate3ResultSet"; //$NON-NLS-1$ static IFormData SYNCHRONIZES_LIST_DEFINITION = new FormData( "Synchronize", - "", //"Description - new FormAttributeData[]{new FormAttributeData("table", 100)}, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("table", 100)}, //$NON-NLS-1$ new String[]{SYNCHRONIZES_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddSynchronize") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddSynchronize") //$NON-NLS-1$ ); static IFormData SYNCHRONIZES_FOLDER_DEFINITION = new FormData( "Synchronize", - "", //"Description - "Synchronize", - new FormAttributeData[]{new FormAttributeData("table", 100)}, + "", //"Description //$NON-NLS-1$ + "Synchronize", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("table", 100)}, //$NON-NLS-1$ new String[]{SYNCHRONIZES_ENTITY}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddSynchronize") + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddSynchronize") //$NON-NLS-1$ ); final static IFormData[] SQL_QUERY_DEFINITIONS = new IFormData[] { new FormData( "SQL Query", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(SQL_QUERY_ENTITY) ), new FormData( "Returns", - "", //"Description - new FormAttributeData[]{new FormAttributeData("alias", 100)}, - new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("alias", 100)}, //$NON-NLS-1$ + new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") //$NON-NLS-1$ ), new FormData( "Return Scalars", - "", //"Description - new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, - new String[]{"Hibernate3ReturnScalar"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddReturnScalar") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[]{"Hibernate3ReturnScalar"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddReturnScalar") //$NON-NLS-1$ ), SYNCHRONIZES_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(SQL_QUERY_ENTITY) ), }; @@ -70,26 +70,26 @@ final static IFormData[] RESULT_SET_DEFINITIONS = new IFormData[] { new FormData( "Result Set", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(RESULT_SET_ENTITY) ), new FormData( "Returns", - "", //"Description - new FormAttributeData[]{new FormAttributeData("alias", 100)}, - new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("alias", 100)}, //$NON-NLS-1$ + new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") //$NON-NLS-1$ ), new FormData( "Return Scalars", - "", //"Description - new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, - new String[]{"Hibernate3ReturnScalar"}, - Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddReturnScalar") + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[]{"Hibernate3ReturnScalar"}, //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddReturnScalar") //$NON-NLS-1$ ), new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(RESULT_SET_ENTITY) ), }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java 2009-07-03 05:38:35 UTC (rev 16371) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java 2009-07-03 06:56:02 UTC (rev 16372) @@ -16,26 +16,26 @@ import org.jboss.tools.common.model.ui.forms.IFormData; public class Hibernate3SetFormLayoutData { - static String SET_ENTITY = "Hibernate3Set"; - static String BAG_ENTITY = "Hibernate3Bag"; + static String SET_ENTITY = "Hibernate3Set"; //$NON-NLS-1$ + static String BAG_ENTITY = "Hibernate3Bag"; //$NON-NLS-1$ final static IFormData[] SET_DEFINITIONS = new IFormData[] { new FormData( "Set", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(SET_ENTITY) ), new FormData( "Key", - "", - "key", - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") + "", //$NON-NLS-1$ + "key", //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$ ), new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("element", 100, "Element Kind") + new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$ } ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, @@ -43,7 +43,7 @@ Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(SET_ENTITY) ), }; @@ -51,20 +51,20 @@ final static IFormData[] BAG_DEFINITIONS = new IFormData[] { new FormData( "Bag", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(BAG_ENTITY) ), new FormData( "Key", - "", - "key", - Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") + "", //$NON-NLS-1$ + "key", //$NON-NLS-1$ + Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$ ), new FormData( "Element", - "", //"Description + "", //"Description //$NON-NLS-1$ new IFormAttributeData[]{ - new FormAttributeData("element", 100, "Element Kind") + new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$ } ), Hibernate3MetaFormLayoutData.META_LIST_DEFINITION, @@ -72,7 +72,7 @@ Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION, new FormData( "Advanced", - "", //"Description + "", //"Description //$NON-NLS-1$ Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(BAG_ENTITY) ), };