June 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r8543 - in trunk/esb/plugins/org.jboss.tools.esb.ui: src/org/jboss/tools/esb/ui/editor/form and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-04 10:24:17 -0400 (Wed, 04 Jun 2008) New Revision: 8543 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/.classpath trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java Log: JBIDE-2022 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/.classpath =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/.classpath 2008-06-04 14:24:04 UTC (rev 8542) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/.classpath 2008-06-04 14:24:17 UTC (rev 8543) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="resources/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2008-06-04 14:24:04 UTC (rev 8542) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2008-06-04 14:24:17 UTC (rev 8543) @@ -68,7 +68,9 @@ List<IFormData> list = new ArrayList<IFormData>(); IFormData g = ModelFormLayoutData.createGeneralFormData(entity); if(g != null) list.add(g); - if(entity.getChild(ENT_ESB_PROPERTY) != null) { + if(entityName.startsWith(PREACTION_PREFIX)) { + //do nothing; when specific children exist use specific forms + } else if(entity.getChild(ENT_ESB_PROPERTY) != null) { list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION); } else if(entityName.equals(ENT_ESB_LISTENERS)) { list.add(ESBListsFormLayoutData.ESB_LISTENER_LIST_DEFINITION);

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8542 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-04 10:24:04 -0400 (Wed, 04 Jun 2008) New Revision: 8542 Added: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java Modified: trunk/esb/plugins/org.jboss.tools.esb.core/.classpath trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java Log: JBIDE-2022 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/.classpath =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/.classpath 2008-06-04 14:22:07 UTC (rev 8541) +++ trunk/esb/plugins/org.jboss.tools.esb.core/.classpath 2008-06-04 14:24:04 UTC (rev 8542) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="resources/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-06-04 14:22:07 UTC (rev 8541) +++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-06-04 14:24:04 UTC (rev 8542) @@ -4,6 +4,7 @@ <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/esb.meta"/> + <meta path="meta/esb-actions.meta"/> </extension> <extension point="org.jboss.tools.common.model.keys"> Added: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-04 14:24:04 UTC (rev 8542) @@ -0,0 +1,552 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="ESB Editor" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="AnyElementPresentation"> + <PAIR name="route-to,object-path" value="org.jboss.tools.esb.core.model.ESBAnyElementPresentation"/> + </MAPPING> + <MAPPING name="FileVersions"> + <PAIR name="ESB1.0.1" value="FileESB101"/> + </MAPPING> + <MAPPING name="FilteredTreeConstraints"/> + <MAPPING name="FilteredTrees"/> + <MAPPING name="Handlers"/> + <MAPPING name="Implementations"> + <PAIR name="ESB" value="org.jboss.tools.esb.core.model.ESBCustomizedObjectImpl"/> + </MAPPING> + <MAPPING name="Recognizers"> + <PAIR name="xml$47" value="org.jboss.tools.esb.core.model.ESBEntityRecognizer"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="action"> + <GROUP name="new"> + <GROUP name="esb"> + <ICON name="file" path="plugin:org.jboss.tools.esb.core:images/esb/new_esb_file.gif"/> + </GROUP> + </GROUP> + </GROUP> + <GROUP name="main"> + <GROUP name="esb"> + <ICON name="action" path="plugin:org.jboss.tools.esb.core:images/esb/action.gif"/> + <ICON name="actions" path="plugin:org.jboss.tools.esb.core:images/esb/action_list.gif"/> + <ICON name="bus" path="plugin:org.jboss.tools.esb.core:images/esb/bus.gif"/> + <ICON name="config" path="plugin:org.jboss.tools.esb.core:images/esb/config.gif"/> + <ICON name="file" path="plugin:org.jboss.tools.esb.core:images/esb/esb_file.gif"/> + <ICON name="filter" path="plugin:org.jboss.tools.esb.core:images/esb/filter.gif"/> + <ICON name="listener" path="plugin:org.jboss.tools.esb.core:images/esb/listener.gif"/> + <ICON name="listeners" path="images/file/closed_folder.gif"/> + <ICON name="property" path="plugin:org.jboss.tools.esb.core:images/esb/property.gif"/> + <ICON name="provider" path="plugin:org.jboss.tools.esb.core:images/esb/provider.gif"/> + <ICON name="providers" path="images/file/closed_folder.gif"/> + <ICON name="schedule" path="plugin:org.jboss.tools.esb.core:images/esb/schedule.gif"/> + <ICON name="service" path="plugin:org.jboss.tools.esb.core:images/esb/service.gif"/> + <ICON name="services" path="images/file/closed_folder.gif"/> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionByteArrayToString101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.ByteArrayToString" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="encoding" xmlname="encoding"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionLongToDateConverter101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.LongToDateConverter" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionMessagePersister101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.MessagePersister" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="classification" xmlname="classification"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="message store class" xmlname="message-store-class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectInvoke101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.ObjectInvoke" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="class processor" xmlname="class-processor"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="class method" xmlname="class-method"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToCSVString101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.ObjectToCSVString" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="bean properties" xmlname="bean-properties"/> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(false)" name="fail on missing property" xmlname="fail-on-missing-property"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToXStream101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.ObjectToXStream" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="class alias" xmlname="class-alias"/> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(true)" name="exclude package" xmlname="exclude-package"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSmooksTransformer101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.SmooksTransformer" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="resource config" xmlname="resource-config"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" name="from" xmlname="from"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="from type" xmlname="from-type"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" name="to" xmlname="to"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="to type" xmlname="to-type"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionXStreamToObject101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreAlias"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.converters.XStreamToObject" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="class alias" xmlname="class-alias"/> + <XModelAttribute PROPERTIES="category=general;pre=true;save=always" + name="exclude package" xmlname="exclude-package"> + <Constraint loader="ListString"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general;save=always" + name="incoming type" xmlname="incoming-type"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="root node" xmlname="root-node"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Alias..." kind="action" name="AddAlias"> + <EntityData EntityName="ESBPreAlias"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=alias" + XMLSUBPATH="alias" name="ESBPreAlias"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="alias" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="ESBActions101"> + <XChildrenEntities> + <XChildEntity name="ESBPreActionByteArrayToString101"/> + <XChildEntity name="ESBPreActionLongToDateConverter101"/> + <XChildEntity name="ESBPreActionObjectInvoke101"/> + <XChildEntity name="ESBPreActionObjectToCSVString101"/> + <XChildEntity name="ESBPreActionObjectToXStream101"/> + <XChildEntity name="ESBPreActionSmooksTransformer101"/> + <XChildEntity name="ESBPreActionMessagePersister101"/> + <XChildEntity name="ESBPreActionXStreamToObject101"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem displayName="Pre-packed Action" group="1" kind="list" name="PrePackedAction"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Byte Array To String..." kind="action" name="AddByteArrayToString"> + <EntityData EntityName="ESBPreActionByteArrayToString101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="encoding" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Long To Date..." kind="action" name="AddLongToDate"> + <EntityData EntityName="ESBPreActionLongToDateConverter101"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Object Invoke..." kind="action" name="AddObjectInvoke"> + <EntityData EntityName="ESBPreActionObjectInvoke101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class processor"/> + <AttributeData AttributeName="class method"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Object To CSV String..." kind="action" name="AddObjectToCSVString"> + <EntityData EntityName="ESBPreActionObjectToCSVString101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="bean properties"/> + <AttributeData AttributeName="fail on missing property" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Object To XStream..." kind="action" name="AddObjectToXStream"> + <EntityData EntityName="ESBPreActionObjectToXStream101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class alias" Mandatory="no"/> + <AttributeData AttributeName="exclude package" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Smooks Transformer..." kind="action" name="AddSmooksTransformer"> + <EntityData EntityName="ESBPreActionSmooksTransformer101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="resource config"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="from type" Mandatory="no"/> + <AttributeData AttributeName="to" Mandatory="no"/> + <AttributeData AttributeName="to type" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Message Persister..." kind="action" name="AddMessagePersister"> + <EntityData EntityName="ESBPreActionMessagePersister101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="classification" Mandatory="no"/> + <AttributeData AttributeName="message store class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="XStream To Object..." kind="action" name="AddXStreamToObject"> + <EntityData EntityName="ESBPreActionXStreamToObject101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class alias" Mandatory="no"/> + <AttributeData AttributeName="exclude package" Mandatory="no"/> + <AttributeData AttributeName="incoming type"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> +</XModelEntityGroup> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-04 14:22:07 UTC (rev 8541) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-04 14:24:04 UTC (rev 8542) @@ -124,7 +124,7 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Add Action..." kind="action" name="AddAction"> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-04 14:22:07 UTC (rev 8541) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-04 14:24:04 UTC (rev 8542) @@ -34,6 +34,8 @@ public String ENT_ESB_FTP_PROVIDER = "ESBFTPProvider101"; //$NON-NLS-1$ public String ENT_ESB_SQL_PROVIDER = "ESBSQLProvider101"; //$NON-NLS-1$ public String ENT_ESB_HIBERNATE_PROVIDER = "ESBHibernateProvider101"; //$NON-NLS-1$ + + static String PREACTION_PREFIX = "ESBPreAction"; public String[] PROVIDERS_101 = { ENT_ESB_PROVIDER, Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-04 14:22:07 UTC (rev 8541) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-04 14:24:04 UTC (rev 8542) @@ -32,9 +32,18 @@ return super.isSaveable(entity, n, v, dv); } + public void loadChildren(Element element, XModelObject o) { + super.loadChildren(element, o); + if(SpecificActionLoader.instance.isActionsFolder(o.getModelEntity().getName())) { + SpecificActionLoader.instance.convertChildrenToSpecific(o); + } + } public boolean save(Element parent, XModelObject o) { if(!needToSave(o)) return true; + if(SpecificActionLoader.instance.isPreActionEntity(o)) { + o = SpecificActionLoader.instance.convertSpecificActionToBasic(o); + } return super.save(parent, o); } Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2008-06-04 14:24:04 UTC (rev 8542) @@ -0,0 +1,212 @@ +package org.jboss.tools.esb.core.model; + +import java.util.HashMap; +import java.util.Map; + +import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.RegularObjectImpl; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.esb.core.ESBCorePlugin; +import org.jboss.tools.esb.core.model.converters.AliasConverter; + +public class SpecificActionLoader implements ESBConstants { + public static SpecificActionLoader instance = new SpecificActionLoader(); + + static String ACTION_ENTITY = "ESBAction"; + static String ACTIONS_FOLDER_ENTITY = "ESBActions"; + + /** + * Version suffix should be added to entity name + */ + String[][] SPECIFIC_ACTIONS = { + {"org.jboss.soa.esb.actions.converters.ByteArrayToString", "ESBPreActionByteArrayToString"}, + //encoding + {"org.jboss.soa.esb.actions.converters.LongToDateConverter", "ESBPreActionLongToDateConverter"}, + //- + {"org.jboss.soa.esb.actions.converters.ObjectInvoke", "ESBPreActionObjectInvoke"}, + //class-processor, class-method + {"org.jboss.soa.esb.actions.converters.ObjectToCSVString", "ESBPreActionObjectToCSVString"}, + //bean-properties, fail-on-missing-property + {"org.jboss.soa.esb.actions.converters.ObjectToXStream", "ESBPreActionObjectToXStream"}, + //class-alias, exclude-package + {"org.jboss.soa.esb.actions.converters.SmooksTransformer", "ESBPreActionSmooksTransformer"}, + //resource-config; from, from-type, to, to-type + {"org.jboss.soa.esb.actions.MessagePersister", "ESBPreActionMessagePersister"}, + //classification, message-store-class + {"org.jboss.soa.esb.actions.converters.XStreamToObject", "ESBPreActionXStreamToObject"}, + //class-alias, exclude-package, incoming-type, root-node, aliases + {"org.jboss.soa.esb.actions.jbpm.CommandInterpreter", "ESBPreActionCommandInterpreter"}, + // + {"org.jboss.soa.esb.actions.scripting.GroovyActionProcessor", "ESBPreActionGroovyActionProcessor"}, + //script + {"org.jboss.soa.esb.actions.Aggregator", "ESBPreActionAggregator"}, + //timeoutInMillies + {"org.jboss.soa.esb.actions.ContentBasedRouter", "ESBPreActionContentBasedRouter"}, + //ruleSet, ruleLanguage, ruleReload, destinations! + {"org.jboss.soa.esb.actions.StaticRouter", "ESBPreActionStaticRouter"}, + //destinations! + {"org.jboss.soa.esb.actions.StaticWiretap", "ESBPreActionStaticWiretap"}, + //destinations! + {"org.jboss.soa.esb.actions.Notifier", "ESBPreActionNotifier"}, + //destinations! NotificationList/target ... + {"org.jboss.soa.esb.actions.soap.SOAPProcessor", "ESBPreActionSOAPProcessor"}, + //jbossws-endpoint + {"org.jboss.soa.esb.actions.soap.SOAPClient", "ESBPreActionSOAPClient"}, + //wsdl, operation +other + {"org.jboss.soa.esb.actions.SystemPrintln", "ESBPreActionSystemPrintln"}, + //message, printfull, outputstream + }; + + Map<String,String> classToEntity = new HashMap<String, String>(); + Map<String,String> entityToClass = new HashMap<String, String>(); + + SpecificActionLoader() { + for (int i = 0; i < SPECIFIC_ACTIONS.length; i++) { + String[] action = SPECIFIC_ACTIONS[i]; + classToEntity.put(action[0], action[1]); + entityToClass.put(action[1], action[0]); + } + } + + public boolean isPreActionEntity(XModelObject object) { + String entityName = object.getModelEntity().getName(); + return isPreActionEntity(entityName); + } + + public boolean isPreActionEntity(String entity) { + return entity.startsWith(PREACTION_PREFIX); + } + + public boolean isActionsFolder(String entity) { + return entity.startsWith(ACTIONS_FOLDER_ENTITY); + } + + public void convertChildrenToSpecific(XModelObject actions) { + if(!isActionsFolder(actions.getModelEntity().getName())) return; + + String suffix = actions.getModelEntity().getName().substring(ACTIONS_FOLDER_ENTITY.length()); + boolean modified = false; + + XModelObject[] as = actions.getChildren(); + for (int i = 0; i < as.length; i++) { + String cls = as[i].getAttributeValue("class"); + if(cls == null) continue; + String entityName = classToEntity.get(cls); + if(entityName == null) continue; + entityName += suffix; + XModelObject action = convertBasicActionToSpecific(as[i], entityName); + if(action != null) { + as[i] = action; + modified = true; + } + } + if(modified) { + ((RegularObjectImpl)actions).replaceChildren(as); + } + + } + + public XModelObject convertBasicActionToSpecific(XModelObject basic, String entityName) { + XModelEntity entity = basic.getModelEntity().getMetaModel().getEntity(entityName); + if(entity == null) return null;; + XModelObject action = basic.getModel().createModelObject(entityName, null); + try { + XModelObjectLoaderUtil.mergeAttributes(action, basic); + } catch (XModelException e) { + ESBCorePlugin.log(e); + } + XAttribute[] as = entity.getAttributes(); + for (int i = 0; i < as.length; i++) { + String pre = as[i].getProperty("pre"); + if(pre == null || pre.length() == 0) continue; + if("true".equals(pre)) { + String name = as[i].getXMLName(); + XModelObject p = basic.getChildByPath(name); + if(p == null) continue; + String value = p.getAttributeValue("value"); + action.setAttributeValue(as[i].getName(), value); + action.set(as[i].getXMLName() + ".#comment", p.getAttributeValue("comment")); + p.removeFromParent(); + } else { + //very specific cases + } + } + + XChild[] ce = action.getModelEntity().getChildren(); + for (int i = 0; i < ce.length; i++) { + String childEntityName = ce[i].getName(); + if(ESBConstants.ENT_ESB_PROPERTY.equals(childEntityName)) continue; + XModelEntity childEntity = action.getModelEntity().getMetaModel().getEntity(childEntityName); + if(childEntity == null) continue; + String converter = childEntity.getProperty("converter"); + if("alias".equals(converter)) { + new AliasConverter().toSpecific(basic, action); + } + //TODO + } + + XModelObject[] cs = basic.getChildren(ESBConstants.ENT_ESB_PROPERTY); + for (int i = 0; i < cs.length; i++) { + action.addChild(cs[i]); + } + + return action; + } + + public XModelObject convertSpecificActionToBasic(XModelObject action) { + String entityName = action.getModelEntity().getName(); + if(!isPreActionEntity(entityName)) return action; + + String suffix = "101"; //compute + + XModelObject result = action.getModel().createModelObject(ACTION_ENTITY + suffix, null); + try { + XModelObjectLoaderUtil.mergeAttributes(result, action); + } catch (XModelException e) { + ESBCorePlugin.log(e); + } + + XModelEntity entity = action.getModelEntity(); + XAttribute[] as = entity.getAttributes(); + for (int i = 0; i < as.length; i++) { + String pre = as[i].getProperty("pre"); + if(pre == null || pre.length() == 0) continue; + if("true".equals(pre)) { + String value = action.getAttributeValue(as[i].getName()); + if(value == null || (value.length() == 0 && !"always".equals(as[i].getProperty("save")))) { + continue; + } + XModelObject p = action.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null); + p.setAttributeValue("name", as[i].getXMLName()); + p.setAttributeValue("value", value); + p.setAttributeValue("comment", action.get(as[i].getXMLName() + ".#comment")); + result.addChild(p); + } else { + //very specific cases + } + } + + XChild[] ce = entity.getChildren(); + for (int i = 0; i < ce.length; i++) { + String childEntityName = ce[i].getName(); + if(ESBConstants.ENT_ESB_PROPERTY.equals(childEntityName)) continue; + XModelEntity childEntity = entity.getMetaModel().getEntity(childEntityName); + if(childEntity == null) continue; + String converter = childEntity.getProperty("converter"); + if("alias".equals(converter)) { + new AliasConverter().toBasic(result, action); + } + //TODO + } + + XModelObject[] cs = action.getChildren(ESBConstants.ENT_ESB_PROPERTY); + for (int i = 0; i < cs.length; i++) { + result.addChild(cs[i].copy()); + } + return result; + } +} Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java 2008-06-04 14:24:04 UTC (rev 8542) @@ -0,0 +1,62 @@ +package org.jboss.tools.esb.core.model.converters; + +import java.util.HashMap; +import java.util.Map; + +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.AnyElementObjectImpl; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.esb.core.model.ESBConstants; + +public class AliasConverter implements IPropertyConverter { + static String ALIAS_ENTITY = "ESBPreAlias"; + + public void toSpecific(XModelObject basicAction, XModelObject specificAction) { + XModelObject p = basicAction.getChildByPath("aliases"); + if(p == null) return; + XModelObject[] as = p.getChildren(); + for (int i = 0; i < as.length; i++) { + if(as[i] instanceof AnyElementObjectImpl) { + Map<String, String> attr = toMap(((AnyElementObjectImpl)as[i]).getAttributes()); + String n = attr.get(ESBConstants.ATTR_NAME); + String v = attr.get(ESBConstants.ATTR_VALUE); + if(n == null || v == null) { + continue; + } + XModelObject a = specificAction.getModel().createModelObject(ALIAS_ENTITY, null); + a.setAttributeValue(ESBConstants.ATTR_NAME, n); + a.setAttributeValue(ESBConstants.ATTR_VALUE, v); + specificAction.addChild(a); + } + } + p.removeFromParent(); + } + + public void toBasic(XModelObject basicAction, XModelObject specificAction) { + XModelObject[] as = specificAction.getChildren(ALIAS_ENTITY); + if(as.length == 0) return; + XModelObject p = basicAction.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null); + p.setAttributeValue(ESBConstants.ATTR_NAME, "aliases"); + basicAction.addChild(p); + for (int i = 0; i < as.length; i++) { + XModelObject t = basicAction.getModel().createModelObject("AnyElement", null); + t.setAttributeValue("tag", "alias"); + String attrs = ESBConstants.ATTR_NAME + "=" + + as[i].getAttributeValue(ESBConstants.ATTR_NAME) + + ";" + ESBConstants.ATTR_VALUE + "=" + + as[i].getAttributeValue(ESBConstants.ATTR_VALUE); + t.setAttributeValue("attributes", attrs); + t.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + (i + 1)); + p.addChild(t); + } + } + + static Map<String, String> toMap(String[][] attributes) { + Map<String,String> map = new HashMap<String, String>(); + for (int i = 0; i < attributes.length; i++) { + map.put(attributes[i][0], attributes[i][1]); + } + return map; + } + +} Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java 2008-06-04 14:24:04 UTC (rev 8542) @@ -0,0 +1,11 @@ +package org.jboss.tools.esb.core.model.converters; + +import org.jboss.tools.common.model.XModelObject; + +public interface IPropertyConverter { + + public void toSpecific(XModelObject basicAction, XModelObject specificAction); + + public void toBasic(XModelObject basicAction, XModelObject specificAction); + +}

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8541 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor: editors and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-06-04 10:22:07 -0400 (Wed, 04 Jun 2008) New Revision: 8541 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/figures/TitleLabel.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ComponentShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Connection.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ExpandeableShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -22,7 +22,7 @@ public class VisualEditorPlugin extends BaseUIPlugin { - public final static String PLUGIN_ID= "org.jboss.tools.hibernate.ui.veditor"; + public final static String PLUGIN_ID= "org.jboss.tools.hibernate.ui.veditor"; //$NON-NLS-1$ //The shared instance. private static VisualEditorPlugin plugin; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -13,7 +13,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.messages"; + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.messages"; //$NON-NLS-1$ private Messages() { } @@ -23,4 +23,5 @@ } public static String EditorActionContributor_Refresh_Visual_Mapping; + public static String VISUALEDITOR_DIAGRAM_FOR; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -73,7 +73,7 @@ PopupMenuProvider provider = new PopupMenuProvider(viewer, getActionRegistry()); viewer.setContextMenu(provider); - getSite().registerContextMenu("FlowDiagramContextmenu", provider, viewer); + getSite().registerContextMenu("FlowDiagramContextmenu", provider, viewer); //$NON-NLS-1$ } public GraphicalViewer getEditPartViewer() { @@ -144,16 +144,16 @@ Object obj = objectEditorInput.getObject(); if (obj instanceof RootClass) { RootClass rootClass = (RootClass)obj; - setPartName("Diagram for " + rootClass.getEntityName()); + setPartName(Messages.VISUALEDITOR_DIAGRAM_FOR + rootClass.getEntityName()); ormDiagram = new OrmDiagram(configuration, rootClass, objectEditorInput.getJavaProject()); } else if (obj instanceof RootClass[]) { RootClass[] rootClasses = (RootClass[])obj; - String name = rootClasses.length > 0 ? rootClasses[0].getEntityName() : ""; + String name = rootClasses.length > 0 ? rootClasses[0].getEntityName() : ""; //$NON-NLS-1$ for (int i = 1; i < rootClasses.length; i++) { - name += " & " + rootClasses[i].getEntityName(); + name += " & " + rootClasses[i].getEntityName(); //$NON-NLS-1$ } - setPartName("Diagram for " + name); + setPartName(Messages.VISUALEDITOR_DIAGRAM_FOR + name); ormDiagram = new OrmDiagram(configuration, rootClasses, objectEditorInput.getJavaProject()); } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -15,7 +15,7 @@ public class AutoLayoutAction extends Action { - public static final String ACTION_ID = "Auto layout"; + public static final String ACTION_ID = "Auto layout"; //$NON-NLS-1$ private VisualEditor editor; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -23,7 +23,7 @@ public class ExportImageAction extends Action { - public static final String ACTION_ID = "Export as Image"; + public static final String ACTION_ID = Messages.EXPORTIMAGEACTION_EXPORT_AS_IMAGE; private VisualEditor editor; @@ -32,7 +32,7 @@ setId(ACTION_ID); setText(ACTION_ID); setImageDescriptor(ImageDescriptor.createFromFile( - VisualEditor.class,"icons/export.png")); + VisualEditor.class,"icons/export.png")); //$NON-NLS-1$ } public void run() { @@ -40,9 +40,9 @@ FileDialog saveDialog = new FileDialog( this.editor.getSite().getShell(), SWT.SAVE); saveDialog - .setFilterExtensions(new String[] { "*.png", "*.jpg", "*.bmp" }); - saveDialog.setFilterNames(new String[] { "PNG format (*.png)", - "JPEG format (*.jpg)", "Bitmap format (*.bmp)" }); + .setFilterExtensions(new String[] { "*.png", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + saveDialog.setFilterNames(new String[] { Messages.EXPORTIMAGEACTION_PNG_FORMAT, + Messages.EXPORTIMAGEACTION_JPG_FORMAT, Messages.EXPORTIMAGEACTION_BMP_FORMAT }); String filePath = saveDialog.open(); if (filePath == null || filePath.trim().length() == 0) { @@ -54,9 +54,9 @@ .getLayer(LayerConstants.PRINTABLE_LAYERS); try { int imageType = SWT.IMAGE_BMP; - if (filePath.toLowerCase().endsWith(".jpg")) { + if (filePath.toLowerCase().endsWith(".jpg")) { //$NON-NLS-1$ imageType = SWT.IMAGE_JPEG; - } else if (filePath.toLowerCase().endsWith(".png")) { + } else if (filePath.toLowerCase().endsWith(".png")) { //$NON-NLS-1$ imageType = SWT.IMAGE_PNG; } @@ -67,7 +67,7 @@ outStream.close(); } catch (Throwable e) { MessageDialog.openInformation(this.editor.getSite().getShell(), - "Error", "Failed to export image: " + e.getMessage()); + Messages.EXPORTIMAGEACTION_ERROR, Messages.EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE + e.getMessage()); return; } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -0,0 +1,25 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.actions; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.actions.messages"; //$NON-NLS-1$ + public static String EXPORTIMAGEACTION_BMP_FORMAT; + public static String EXPORTIMAGEACTION_ERROR; + public static String EXPORTIMAGEACTION_EXPORT_AS_IMAGE; + public static String EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE; + public static String EXPORTIMAGEACTION_JPG_FORMAT; + public static String EXPORTIMAGEACTION_PNG_FORMAT; + public static String OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE; + public static String OPENMAPPINGACTION_OPEN_MAPPING_FILE; + public static String OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE; + public static String OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE; + public static String OPENSOURCEACTION_OPEN_SOURCE_FILE; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -28,13 +28,13 @@ * */ public class OpenMappingAction extends SelectionAction { - public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; + public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; //$NON-NLS-1$ public OpenMappingAction(IWorkbenchPart part) { super(part); setId(ACTION_ID); - setText("Open Mapping File"); - setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/mapping.gif")); + setText(Messages.OPENMAPPINGACTION_OPEN_MAPPING_FILE); + setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/mapping.gif")); //$NON-NLS-1$ } public void run() { @@ -56,7 +56,7 @@ try { org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel, parentProperty, consoleConfiguration); } catch (Exception e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't find or open mapping file.", e); + HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE, e); } continue; } @@ -66,7 +66,7 @@ try { org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection, consoleConfiguration); } catch (Exception e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't find or open mapping file.", e); + HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENMAPPINGACTION_OPEN_MAPPING_FILE, e); } /*IResource resource = null; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -23,13 +23,13 @@ * */ public class OpenSourceAction extends SelectionAction { - public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; + public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; //$NON-NLS-1$ public OpenSourceAction(IWorkbenchPart part) { super(part); setId(ACTION_ID); - setText("Open Source File"); - setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/java.gif")); + setText(Messages.OPENSOURCEACTION_OPEN_SOURCE_FILE); + setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/java.gif")); //$NON-NLS-1$ } public void run() { @@ -59,11 +59,11 @@ try { new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj, fullyQualifiedName); } catch (PartInitException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't open source file.", e); + HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE, e); } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source file.", e); + HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE, e); } catch (FileNotFoundException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source file.", e); + HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE, e); } } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties 2008-06-04 14:22:07 UTC (rev 8541) @@ -0,0 +1,11 @@ +EXPORTIMAGEACTION_BMP_FORMAT=Bitmap format (*.bmp) +EXPORTIMAGEACTION_ERROR=Error +EXPORTIMAGEACTION_EXPORT_AS_IMAGE=Export as Image +EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE=Failed to export image: +EXPORTIMAGEACTION_JPG_FORMAT=JPEG format (*.jpg) +EXPORTIMAGEACTION_PNG_FORMAT=PNG format (*.png) +OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE=Can't find or open mapping file. +OPENMAPPINGACTION_OPEN_MAPPING_FILE=Open Mapping File +OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE=Can't find source file. +OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE=Can't open source file. +OPENSOURCEACTION_OPEN_SOURCE_FILE=Open Source File Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -0,0 +1,15 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.command; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.command.messages"; //$NON-NLS-1$ + public static String SHAPESETCONSTRAINTCOMMAND_MOVE; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -33,7 +33,7 @@ this.shape = shape; this.request = req; this.newLocation = newLocation.getCopy(); - setLabel("move"); + setLabel(Messages.SHAPESETCONSTRAINTCOMMAND_MOVE); } public boolean canExecute() { Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties 2008-06-04 14:22:07 UTC (rev 8541) @@ -0,0 +1 @@ +SHAPESETCONSTRAINTCOMMAND_MOVE=move Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/figures/TitleLabel.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/figures/TitleLabel.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/figures/TitleLabel.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -19,8 +19,8 @@ public class TitleLabel extends Label { - static Image shevronUp = ViewPlugin.getImageDescriptor(ViewPlugin.BUNDLE_IMAGE.getString("VisualMapping.shevronUp")).createImage(); - static Image shevronDown = ViewPlugin.getImageDescriptor(ViewPlugin.BUNDLE_IMAGE.getString("VisualMapping.shevronDown")).createImage(); + static Image shevronUp = ViewPlugin.getImageDescriptor(ViewPlugin.BUNDLE_IMAGE.getString("VisualMapping.shevronUp")).createImage(); //$NON-NLS-1$ + static Image shevronDown = ViewPlugin.getImageDescriptor(ViewPlugin.BUNDLE_IMAGE.getString("VisualMapping.shevronDown")).createImage(); //$NON-NLS-1$ protected boolean hiden = false; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties 2008-06-04 14:22:07 UTC (rev 8541) @@ -1 +1,2 @@ EditorActionContributor_Refresh_Visual_Mapping=Refresh Visual Mapping +VISUALEDITOR_DIAGRAM_FOR=Diagram for Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ComponentShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ComponentShape.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ComponentShape.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -14,7 +14,7 @@ import org.hibernate.mapping.Property; public class ComponentShape extends ExpandeableShape { - public static final String SET_CHILDS_HIDEN = "set childs hiden"; + public static final String SET_CHILDS_HIDEN = "set childs hiden"; //$NON-NLS-1$ //protected boolean childsHiden = true; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Connection.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Connection.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Connection.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -11,9 +11,9 @@ package org.jboss.tools.hibernate.ui.veditor.editors.model; public class Connection extends ModelElement { - public static final String HIDE_SELECTION = "hide selection"; - public static final String SHOW_SELECTION = "show selection"; - public static final String SET_HIDEN = "set hiden"; + public static final String HIDE_SELECTION = "hide selection"; //$NON-NLS-1$ + public static final String SHOW_SELECTION = "show selection"; //$NON-NLS-1$ + public static final String SET_HIDEN = "set hiden"; //$NON-NLS-1$ private Shape source; private Shape target; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ExpandeableShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ExpandeableShape.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ExpandeableShape.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -10,17 +10,9 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.veditor.editors.model; -import java.beans.PropertyChangeEvent; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.swt.graphics.RGB; -import org.jboss.tools.hibernate.ui.veditor.editors.parts.ResourceManager; - public class ExpandeableShape extends Shape { - public static final String SHOW_REFERENCES = "show references"; + public static final String SHOW_REFERENCES = "show references"; //$NON-NLS-1$ public boolean refHide = true; protected boolean first=false; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -50,8 +50,8 @@ public class OrmDiagram extends ModelElement { - public static final String REFRESH = "refresh"; - public static final String DIRTY = "dirty"; + public static final String REFRESH = "refresh"; //$NON-NLS-1$ + public static final String DIRTY = "dirty"; //$NON-NLS-1$ private boolean dirty = false; private String childrenLocations[]; private HashMap<String,OrmShape> elements = new HashMap<String,OrmShape>(); @@ -60,7 +60,7 @@ private ConsoleConfiguration consoleConfiguration; private IJavaProject javaProject; private String[] entityNames; - public static final String HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME = "hibernateMapping"; + public static final String HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME = "hibernateMapping"; //$NON-NLS-1$ public OrmDiagram(ConsoleConfiguration configuration, RootClass ioe, IJavaProject javaProject) { consoleConfiguration = configuration; @@ -72,8 +72,8 @@ this.javaProject = javaProject; if (ioe instanceof RootClass) { - String string = ""; - childrenLocations = string.split("#"); + String string = ""; //$NON-NLS-1$ + childrenLocations = string.split("#"); //$NON-NLS-1$ } getOrCreatePersistentClass(ormElements[0], null); expandModel(this); @@ -92,8 +92,8 @@ } this.javaProject = javaProject; if (ioe instanceof RootClass[]) { - String string = ""; - childrenLocations = string.split("#"); + String string = ""; //$NON-NLS-1$ + childrenLocations = string.split("#"); //$NON-NLS-1$ } for (int i = 0; i < ormElements.length; i++) { getOrCreatePersistentClass(ormElements[i], null); @@ -104,7 +104,7 @@ } private IPath getStoreFolderPath() { - return javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME); + return javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME); //$NON-NLS-1$ } private IPath getStoreFilePath() { @@ -112,11 +112,11 @@ } private String getStoreFileName() { - String name = ormElements.length > 0 ? ormElements[0].getClassName() : ""; + String name = ormElements.length > 0 ? ormElements[0].getClassName() : ""; //$NON-NLS-1$ for (int i = 1; i < ormElements.length; i++) { - name += "_" + ormElements[i].getClassName(); + name += "_" + ormElements[i].getClassName(); //$NON-NLS-1$ } - return consoleConfiguration.getName() + "_" + name; + return consoleConfiguration.getName() + "_" + name; //$NON-NLS-1$ } public HashMap getCloneElements() { @@ -176,11 +176,11 @@ OrmShape shape = (OrmShape) getChildren().get(i); Object ormElement = shape.getOrmElement(); if (ormElement instanceof RootClass) { - childrenLocations[i] = ((RootClass)ormElement).getEntityName() + "@"; + childrenLocations[i] = ((RootClass)ormElement).getEntityName() + "@"; //$NON-NLS-1$ } else if (ormElement instanceof Table) { - childrenLocations[i] = HibernateUtils.getTableName((Table)ormElement)+"@"; + childrenLocations[i] = HibernateUtils.getTableName((Table)ormElement)+"@"; //$NON-NLS-1$ } - childrenLocations[i] += shape.getLocation().x + ";" + shape.getLocation().y+";" + shape.isHiden(); + childrenLocations[i] += shape.getLocation().x + ";" + shape.getLocation().y+";" + shape.isHiden(); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -353,7 +353,7 @@ if (clazz instanceof RootClass) { RootClass cls = (RootClass)clazz; Table table = cls.getTable(); - if (tableName.equals(table.getName() + "." + table.getName())) { + if (tableName.equals(table.getName() + "." + table.getName())) { //$NON-NLS-1$ if (elements.get(HibernateUtils.getPersistentClassName(cls.getEntityName())) == null) getOrCreatePersistentClass(cls, null); } @@ -617,7 +617,7 @@ key = HibernateUtils.getTableName((Table)element); } else if (element instanceof Property) { Property property = (Property)element; - key = property.getPersistentClass().getEntityName() + "." + property.getName(); + key = property.getPersistentClass().getEntityName() + "." + property.getName(); //$NON-NLS-1$ } else if (element instanceof Subclass) { key = HibernateUtils.getPersistentClassName(((Subclass)element).getEntityName()); } @@ -674,15 +674,15 @@ file.createNewFile(); } FileOutputStream fos = new FileOutputStream(file); - properties.store(fos, ""); + properties.store(fos, ""); //$NON-NLS-1$ } catch (IOException e) { - VisualEditorPlugin.getDefault().logError("Can't save layout of mapping.", e); + VisualEditorPlugin.getDefault().logError("Can't save layout of mapping.", e); //$NON-NLS-1$ } } public IFile createLayoutFile(InputStream source) { IFile file = null; - IPath path = javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME); + IPath path = javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME); //$NON-NLS-1$ IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path); if(!folder.exists()) { try { @@ -712,7 +712,7 @@ loadSuccessfull = true; } }catch(IOException ex){ - VisualEditorPlugin.getDefault().logError("Can't load layout of mapping.", ex); + VisualEditorPlugin.getDefault().logError("Can't load layout of mapping.", ex); //$NON-NLS-1$ } } @@ -731,37 +731,37 @@ } public void setState(Properties properties,Shape shape, boolean value){ - setState(properties, getKey(shape)+".state", value); + setState(properties, getKey(shape)+".state", value); //$NON-NLS-1$ } private boolean getState(Properties properties, String key){ - String str = properties.getProperty(key, "true"); + String str = properties.getProperty(key, "true"); //$NON-NLS-1$ return new Boolean(str).booleanValue(); } private Point getPoint(Properties properties, String key){ Point point = new Point(0,0); - String str = properties.getProperty(key+".x","0"); + String str = properties.getProperty(key+".x","0"); //$NON-NLS-1$ //$NON-NLS-2$ point.x = Integer.parseInt(str); - String str2 = properties.getProperty(key+".y","0"); + String str2 = properties.getProperty(key+".y","0"); //$NON-NLS-1$ //$NON-NLS-2$ point.y = Integer.parseInt(str2); return point; } private void setPoint(Properties properties, String key, Point point){ - String key1 = key+".x"; + String key1 = key+".x"; //$NON-NLS-1$ if(!properties.containsKey(key1)){ properties.remove(key1); - properties.put(key1, ""+point.x); + properties.put(key1, ""+point.x); //$NON-NLS-1$ }else - properties.put(key1, ""+point.x); - String key2 = key+".y"; + properties.put(key1, ""+point.x); //$NON-NLS-1$ + String key2 = key+".y"; //$NON-NLS-1$ if(!properties.containsKey(key2)){ properties.remove(key2); - properties.put(key2, ""+point.y); + properties.put(key2, ""+point.y); //$NON-NLS-1$ }else - properties.put(key2, ""+point.y); + properties.put(key2, ""+point.y); //$NON-NLS-1$ } public void setPosition(Properties properties, OrmShape shape){ @@ -774,7 +774,7 @@ } public boolean getState(Properties properties, Shape shape){ - return getState(properties, getKey(shape)+".state"); + return getState(properties, getKey(shape)+".state"); //$NON-NLS-1$ } public IJavaProject getJavaProject() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmShape.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmShape.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -24,9 +24,9 @@ import org.hibernate.mapping.Table; public class OrmShape extends ExpandeableShape { - public static final String SET_HIDEN = "set hiden"; + public static final String SET_HIDEN = "set hiden"; //$NON-NLS-1$ - public static final String LOCATION_PROP = "OrmShape.Location"; + public static final String LOCATION_PROP = "OrmShape.Location"; //$NON-NLS-1$ private Point location = new Point(0, 0); protected boolean hiden = false; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -29,9 +29,9 @@ private List<Connection> sourceConnections = new ArrayList<Connection>(); private List<Connection> targetConnections = new ArrayList<Connection>(); - public static final String HIDE_SELECTION = "hide selection"; - public static final String SHOW_SELECTION = "show selection"; - public static final String SET_FOCUS = "set focus"; + public static final String HIDE_SELECTION = "hide selection"; //$NON-NLS-1$ + public static final String SHOW_SELECTION = "show selection"; //$NON-NLS-1$ + public static final String SET_FOCUS = "set focus"; //$NON-NLS-1$ private Object ormElement; @@ -43,21 +43,21 @@ /** * Property set */ - private static final String PROPERTY_NAME = "name"; - private static final String PROPERTY_TYPE = "type"; - private static final String PROPERTY_CLASS = "persistanceClass"; - private static final String PROPERTY_VALUE = "value"; - private static final String PROPERTY_SELECT = "selectable"; - private static final String PROPERTY_INSERT = "insertable"; - private static final String PROPERTY_UPDATE = "updateable"; - private static final String PROPERTY_CASCADE = "cascade"; - private static final String PROPERTY_LAZY = "lazy"; - private static final String PROPERTY_OPTIONAL = "optional"; - private static final String PROPERTY_NATURAL_IDENTIFIER = "naturalIdentifier"; - private static final String PROPERTY_NODE_NAME = "nodeName"; - private static final String PROPERTY_OPTIMISTIC_LOCKED = "optimisticLocked"; - private static final String PROPERTY_NULLABLE = "nullable"; - private static final String PROPERTY_UNIQUE = "unique"; + private static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ + private static final String PROPERTY_TYPE = "type"; //$NON-NLS-1$ + private static final String PROPERTY_CLASS = "persistanceClass"; //$NON-NLS-1$ + private static final String PROPERTY_VALUE = "value"; //$NON-NLS-1$ + private static final String PROPERTY_SELECT = "selectable"; //$NON-NLS-1$ + private static final String PROPERTY_INSERT = "insertable"; //$NON-NLS-1$ + private static final String PROPERTY_UPDATE = "updateable"; //$NON-NLS-1$ + private static final String PROPERTY_CASCADE = "cascade"; //$NON-NLS-1$ + private static final String PROPERTY_LAZY = "lazy"; //$NON-NLS-1$ + private static final String PROPERTY_OPTIONAL = "optional"; //$NON-NLS-1$ + private static final String PROPERTY_NATURAL_IDENTIFIER = "naturalIdentifier"; //$NON-NLS-1$ + private static final String PROPERTY_NODE_NAME = "nodeName"; //$NON-NLS-1$ + private static final String PROPERTY_OPTIMISTIC_LOCKED = "optimisticLocked"; //$NON-NLS-1$ + private static final String PROPERTY_NULLABLE = "nullable"; //$NON-NLS-1$ + private static final String PROPERTY_UNIQUE = "unique"; //$NON-NLS-1$ static { @@ -192,11 +192,11 @@ StringBuffer name = new StringBuffer(); if (type != null) { - name.append(type != null ? type.toUpperCase() : ""); + name.append(type != null ? type.toUpperCase() : ""); //$NON-NLS-1$ name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); + && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); //$NON-NLS-1$ //$NON-NLS-2$ name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isForeignKey(column) ? " FK" : ""); + && HibernateUtils.isForeignKey(column) ? " FK" : ""); //$NON-NLS-1$ //$NON-NLS-2$ } return name.toString(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -104,7 +104,7 @@ if (ormShape != null) { string = childrenLocations[i] .substring(childrenLocations[i].indexOf('@') + 1); - xy = string.split(";"); + xy = string.split(";"); //$NON-NLS-1$ if (xy.length > 1) try { ormShape.setLocation(new Point(Integer @@ -221,7 +221,7 @@ public void autolayout() { IDiagramInfo process = new DiagramInfo(getCastedModel()); AutoLayout layout = new AutoLayout(); - layout.setGridStep("" + 5); + layout.setGridStep("" + 5); //$NON-NLS-1$ layout.setOverride(true); layout.setProcess(process); } @@ -434,7 +434,7 @@ if (link.getTarget() != null) return link.getTarget().toString(); else - return ""; + return ""; //$NON-NLS-1$ } /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -46,5 +46,13 @@ public static String Colors_DatabaseColumnG; public static String Colors_DatabaseColumnB; + + public static String ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT; + + public static String ORMEDITPARTFACTORY_NULL; + + public static String TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT; + + public static String TREEPARTFACTORY_NULL; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -49,8 +49,8 @@ return new ConnectionEditPart(); } throw new RuntimeException( - "Can't create part for model element: " - + ((modelElement != null) ? modelElement.getClass().getName() : "null")); + Messages.ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT + + ((modelElement != null) ? modelElement.getClass().getName() : Messages.ORMEDITPARTFACTORY_NULL)); } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -56,7 +56,7 @@ TitleFigure figure = new TitleFigure(); figure.setLayoutManager(new ToolbarLayout()); TitleLabel label = new TitleLabel(); - String text = ""; + String text = ""; //$NON-NLS-1$ Object element = getCastedModel().getOrmElement(); if (element instanceof RootClass) { text = ormLabelProvider.getText((PersistentClass)element); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java 2008-06-04 14:22:07 UTC (rev 8541) @@ -18,9 +18,9 @@ if (modelElement instanceof Shape) { return new ShapeTreeEditPart(modelElement); } - throw new RuntimeException("Can't create part for model element: " + throw new RuntimeException(Messages.TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT + ((modelElement != null) ? modelElement.getClass().getName() - : "null")); + : Messages.TREEPARTFACTORY_NULL)); } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties 2008-06-04 13:49:02 UTC (rev 8540) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties 2008-06-04 14:22:07 UTC (rev 8541) @@ -9,4 +9,8 @@ Colors_DatabaseTableB=239 Colors_DatabaseColumnR=239 Colors_DatabaseColumnG=247 -Colors_DatabaseColumnB=255 \ No newline at end of file +Colors_DatabaseColumnB=255 +ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT=Can't create part for model element: +ORMEDITPARTFACTORY_NULL=null +TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT=Can't create part for model element: +TREEPARTFACTORY_NULL=null

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8540 - in trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping: bytecode and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-06-04 09:49:02 -0400 (Wed, 04 Jun 2008) New Revision: 8540 Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/Bean.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/BeanReflectionHelper.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/cut/MonetoryAmountUserType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/Group.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/User.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/Classification.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/SimpleEntityWithAssociation.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/instrument/domain/Problematic.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/CollectionInterceptor.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/Image.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/StatefulInterceptor.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/B.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Bar.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Baz.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Category.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/ComponentNotNullMaster.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Container.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/CustomPersister.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/DoubleStringType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Foo.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/FooComponent.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Fum.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Glarch.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Master.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/MultiplicityType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Qux.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Simple.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Top.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/mapcompelem/Part.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/joined/Address.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/optional/Address.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/proxy/DataPoint.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/typeparameters/DefaultValueIntegerType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/unionsubclass/Human.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/basic/MyListType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/parameterized/DefaultableListType.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/where/NumericTrueFalseType.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -30,7 +30,7 @@ } public String asString() { - return "complex[" + keyString() + "]"; + return "complex[" + keyString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } private String keyString() { @@ -39,7 +39,7 @@ while ( itr.hasNext() ) { buff.append( itr.next() ); if ( itr.hasNext() ) { - buff.append( ", " ); + buff.append( ", " ); //$NON-NLS-1$ } } return buff.toString(); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/Bean.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/Bean.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/Bean.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -73,6 +73,6 @@ } public void throwException() throws ParseException { - throw new ParseException( "you asked for it...", 0 ); + throw new ParseException( "you asked for it...", 0 ); //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/BeanReflectionHelper.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/BeanReflectionHelper.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/bytecode/BeanReflectionHelper.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -12,7 +12,7 @@ public class BeanReflectionHelper { public static final Object[] TEST_VALUES = new Object[] { - "hello", new Long(1), new Integer(1), new Date(), new Long(1), new Integer(1), new Object() + "hello", new Long(1), new Integer(1), new Date(), new Long(1), new Integer(1), new Object() //$NON-NLS-1$ }; private static final String[] getterNames = new String[7]; @@ -21,44 +21,44 @@ static { BasicPropertyAccessor propertyAccessor = new BasicPropertyAccessor(); - Getter getter = propertyAccessor.getGetter( Bean.class, "someString" ); - Setter setter = propertyAccessor.getSetter( Bean.class, "someString" ); + Getter getter = propertyAccessor.getGetter( Bean.class, "someString" ); //$NON-NLS-1$ + Setter setter = propertyAccessor.getSetter( Bean.class, "someString" ); //$NON-NLS-1$ getterNames[0] = getter.getMethodName(); types[0] = getter.getReturnType(); setterNames[0] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "someLong" ); - setter = propertyAccessor.getSetter( Bean.class, "someLong" ); + getter = propertyAccessor.getGetter( Bean.class, "someLong" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "someLong" ); //$NON-NLS-1$ getterNames[1] = getter.getMethodName(); types[1] = getter.getReturnType(); setterNames[1] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "someInteger" ); - setter = propertyAccessor.getSetter( Bean.class, "someInteger" ); + getter = propertyAccessor.getGetter( Bean.class, "someInteger" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "someInteger" ); //$NON-NLS-1$ getterNames[2] = getter.getMethodName(); types[2] = getter.getReturnType(); setterNames[2] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "someDate" ); - setter = propertyAccessor.getSetter( Bean.class, "someDate" ); + getter = propertyAccessor.getGetter( Bean.class, "someDate" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "someDate" ); //$NON-NLS-1$ getterNames[3] = getter.getMethodName(); types[3] = getter.getReturnType(); setterNames[3] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "somelong" ); - setter = propertyAccessor.getSetter( Bean.class, "somelong" ); + getter = propertyAccessor.getGetter( Bean.class, "somelong" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "somelong" ); //$NON-NLS-1$ getterNames[4] = getter.getMethodName(); types[4] = getter.getReturnType(); setterNames[4] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "someint" ); - setter = propertyAccessor.getSetter( Bean.class, "someint" ); + getter = propertyAccessor.getGetter( Bean.class, "someint" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "someint" ); //$NON-NLS-1$ getterNames[5] = getter.getMethodName(); types[5] = getter.getReturnType(); setterNames[5] = setter.getMethodName(); - getter = propertyAccessor.getGetter( Bean.class, "someObject" ); - setter = propertyAccessor.getSetter( Bean.class, "someObject" ); + getter = propertyAccessor.getGetter( Bean.class, "someObject" ); //$NON-NLS-1$ + setter = propertyAccessor.getSetter( Bean.class, "someObject" ); //$NON-NLS-1$ getterNames[6] = getter.getMethodName(); types[6] = getter.getReturnType(); setterNames[6] = setter.getMethodName(); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/cut/MonetoryAmountUserType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/cut/MonetoryAmountUserType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/cut/MonetoryAmountUserType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -20,7 +20,7 @@ public class MonetoryAmountUserType implements CompositeUserType { public String[] getPropertyNames() { - return new String[] { "amount", "currency" }; + return new String[] { "amount", "currency" }; //$NON-NLS-1$//$NON-NLS-2$ } public Type[] getPropertyTypes() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/Group.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/Group.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/Group.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -39,7 +39,7 @@ public void addMember(User member) { if (member == null) { - throw new IllegalArgumentException("Member to add cannot be null"); + throw new IllegalArgumentException("Member to add cannot be null"); //$NON-NLS-1$ } this.members.add(member); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/User.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/User.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/exception/User.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -40,7 +40,7 @@ public void addMembership(Group membership) { if (membership == null) { - throw new IllegalArgumentException("Membership to add cannot be null"); + throw new IllegalArgumentException("Membership to add cannot be null"); //$NON-NLS-1$ } this.memberships.add(membership); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/Classification.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/Classification.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/Classification.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -10,8 +10,8 @@ */ public class Classification implements Serializable, Comparable { - public static final Classification COOL = new Classification( "COOL", 0 ); - public static final Classification LAME = new Classification( "LAME", 1 ); + public static final Classification COOL = new Classification( "COOL", 0 ); //$NON-NLS-1$ + public static final Classification LAME = new Classification( "LAME", 1 ); //$NON-NLS-1$ private static final HashMap INSTANCES = new HashMap(); static { @@ -72,7 +72,7 @@ switch ( ordinal.intValue() ) { case 0: return COOL; case 1: return LAME; - default: throw new IllegalArgumentException( "unknown classification ordinal [" + ordinal + "]" ); + default: throw new IllegalArgumentException( "unknown classification ordinal [" + ordinal + "]" ); //$NON-NLS-1$ //$NON-NLS-2$ } } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/SimpleEntityWithAssociation.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/SimpleEntityWithAssociation.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/hql/SimpleEntityWithAssociation.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -56,7 +56,7 @@ association.unbindFromCurrentOwner(); } else { - throw new IllegalArgumentException( "SimpleAssociatedEntity [" + association + "] not currently bound to this [" + this + "]" ); + throw new IllegalArgumentException( "SimpleAssociatedEntity [" + association + "] not currently bound to this [" + this + "]" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/instrument/domain/Problematic.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/instrument/domain/Problematic.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/instrument/domain/Problematic.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -59,7 +59,7 @@ } public String toString() { - String result = ""; + String result = ""; //$NON-NLS-1$ for ( int i = 0; i < bytes.length; i++ ) { result += bytes[i]; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/CollectionInterceptor.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/CollectionInterceptor.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/CollectionInterceptor.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -9,12 +9,12 @@ public class CollectionInterceptor extends EmptyInterceptor { public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { - ( (User) entity ).getActions().add("updated"); + ( (User) entity ).getActions().add("updated"); //$NON-NLS-1$ return false; } public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { - ( (User) entity ).getActions().add("created"); + ( (User) entity ).getActions().add("created"); //$NON-NLS-1$ return false; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/Image.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/Image.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/Image.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -31,7 +31,7 @@ } public String toString() { - return "Image/" + ( details == null ? "no details" : details.toString() ); + return "Image/" + ( details == null ? "no details" : details.toString() ); //$NON-NLS-1$ //$NON-NLS-2$ } public static class Details { @@ -55,7 +55,7 @@ } public String toString() { - return "Details=" + perm1; + return "Details=" + perm1; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/StatefulInterceptor.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/StatefulInterceptor.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/interceptor/StatefulInterceptor.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -18,14 +18,14 @@ public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { if ( !(entity instanceof Log) ) { - list.add( new Log( "insert", (String) id, entity.getClass().getName() ) ); + list.add( new Log( "insert", (String) id, entity.getClass().getName() ) ); //$NON-NLS-1$ } return false; } public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { if ( !(entity instanceof Log) ) { - list.add( new Log( "update", (String) id, entity.getClass().getName() ) ); + list.add( new Log( "update", (String) id, entity.getClass().getName() ) ); //$NON-NLS-1$ } return false; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/B.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/B.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/B.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -6,7 +6,7 @@ public class B extends A { private int count; private Map map; - private String bName = "B Name"; + private String bName = "B Name"; //$NON-NLS-1$ public int getCount() { return count; Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Bar.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Bar.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Bar.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -3,7 +3,7 @@ public class Bar extends Abstract implements BarProxy, Named { private String barString; - private FooComponent barComponent = new FooComponent("bar", 69, null, null); + private FooComponent barComponent = new FooComponent("bar", 69, null, null); //$NON-NLS-1$ private Baz baz; private int x; private Object object; @@ -39,7 +39,7 @@ this.baz = baz; } - private String name = "bar"; + private String name = "bar"; //$NON-NLS-1$ public String getName() { return name; Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Baz.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Baz.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Baz.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -102,12 +102,12 @@ public void setDefaults() { SortedSet set = new TreeSet(); - set.add("foo"); set.add("bar"); set.add("baz"); + set.add("foo"); set.add("bar"); set.add("baz"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ setStringSet(set); Map map = new TreeMap(); - map.put( "now", new Date() ); - map.put( "never", null ); - map.put( "big bang", new Date(0) ); + map.put( "now", new Date() ); //$NON-NLS-1$ + map.put( "never", null ); //$NON-NLS-1$ + map.put( "big bang", new Date(0) ); //$NON-NLS-1$ setStringDateMap(map); List list = new ArrayList(); list.addAll(set); @@ -116,45 +116,45 @@ setFooArray( new Foo[0] ); setStringArray( (String[]) list.toArray( new String[0] ) ); customs = new ArrayList(); - customs.add( new String[] { "foo", "bar" } ); - customs.add( new String[] { "A", "B" } ); - customs.add( new String[] { "1", "2" } ); + customs.add( new String[] { "foo", "bar" } ); //$NON-NLS-1$ //$NON-NLS-2$ + customs.add( new String[] { "A", "B" } ); //$NON-NLS-1$ //$NON-NLS-2$ + customs.add( new String[] { "1", "2" } ); //$NON-NLS-1$ //$NON-NLS-2$ fooSet = new HashSet(); components = new FooComponent[] { - new FooComponent("foo", 42, null, null), - new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) ) + new FooComponent("foo", 42, null, null), //$NON-NLS-1$ + new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) ) //$NON-NLS-1$ //$NON-NLS-2$ }; timeArray = new Date[] { new Date(), new Date(), null, new Date(0) }; TreeSet x = new TreeSet(); - x.add("w"); x.add("x"); x.add("y"); x.add("z"); + x.add("w"); x.add("x"); x.add("y"); x.add("z"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ TreeSet a = new TreeSet(); - a.add("a"); a.add("b"); a.add("d"); a.add("c"); + a.add("a"); a.add("b"); a.add("d"); a.add("c"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ count = 667; - name="Bazza"; + name="Bazza"; //$NON-NLS-1$ topComponents = new ArrayList(); - topComponents.add( new FooComponent("foo", 11, new Date[] { new Date(), new Date(123) }, null) ); - topComponents.add( new FooComponent("bar", 22, new Date[] { new Date(7), new Date(456) }, null) ); + topComponents.add( new FooComponent("foo", 11, new Date[] { new Date(), new Date(123) }, null) ); //$NON-NLS-1$ + topComponents.add( new FooComponent("bar", 22, new Date[] { new Date(7), new Date(456) }, null) ); //$NON-NLS-1$ topComponents.add( null ); bag = new ArrayList(); - bag.add("duplicate"); - bag.add("duplicate"); - bag.add("duplicate"); - bag.add("unique"); + bag.add("duplicate"); //$NON-NLS-1$ + bag.add("duplicate"); //$NON-NLS-1$ + bag.add("duplicate"); //$NON-NLS-1$ + bag.add("unique"); //$NON-NLS-1$ cached = new TreeSet(); CompositeElement ce = new CompositeElement(); - ce.setFoo("foo"); - ce.setBar("bar"); + ce.setFoo("foo"); //$NON-NLS-1$ + ce.setBar("bar"); //$NON-NLS-1$ CompositeElement ce2 = new CompositeElement(); - ce2.setFoo("fooxxx"); - ce2.setBar("barxxx"); + ce2.setFoo("fooxxx"); //$NON-NLS-1$ + ce2.setBar("barxxx"); //$NON-NLS-1$ cached.add(ce); cached.add(ce2); cachedMap = new TreeMap(); cachedMap.put(this, ce); - text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; //$NON-NLS-1$ for (int i=0; i<10; i++) text+=text; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Category.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Category.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Category.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -9,7 +9,7 @@ */ public class Category { - public static final String ROOT_CATEGORY = "/"; + public static final String ROOT_CATEGORY = "/"; //$NON-NLS-1$ public static final int ROOT_ID = 42; private long id; @@ -73,7 +73,7 @@ } public String toString() { - return id + ":" + name; + return id + ":" + name; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/ComponentNotNullMaster.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/ComponentNotNullMaster.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/ComponentNotNullMaster.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -60,9 +60,9 @@ } public String toString() { - return name + " = " + simple.getCount() + - "/" + ( one==null ? "nil" : one.getKey().toString() ) + - "/" + ( many==null ? "nil" : many.getKey().toString() ); + return name + " = " + simple.getCount() + //$NON-NLS-1$ + "/" + ( one==null ? "nil" : one.getKey().toString() ) + //$NON-NLS-1$ //$NON-NLS-2$ + "/" + ( many==null ? "nil" : many.getKey().toString() ); //$NON-NLS-1$ //$NON-NLS-2$ } public One getOne() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Container.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Container.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Container.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -40,10 +40,10 @@ } public String toString() { - return name + " = " - + (simple==null ? "nil" : Integer.toString( simple.getCount() ) ) - + "/" + ( one==null ? "nil" : one.getKey().toString() ) - + "/" + ( many==null ? "nil" : many.getKey().toString() ); + return name + " = " //$NON-NLS-1$ + + (simple==null ? "nil" : Integer.toString( simple.getCount() ) ) //$NON-NLS-1$ + + "/" + ( one==null ? "nil" : one.getKey().toString() ) //$NON-NLS-1$ //$NON-NLS-2$ + + "/" + ( many==null ? "nil" : many.getKey().toString() ); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/CustomPersister.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/CustomPersister.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/CustomPersister.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -55,7 +55,7 @@ private void checkEntityMode(EntityMode entityMode) { if ( EntityMode.POJO != entityMode ) { - throw new IllegalArgumentException( "Unhandled EntityMode : " + entityMode ); + throw new IllegalArgumentException( "Unhandled EntityMode : " + entityMode ); //$NON-NLS-1$ } } @@ -380,7 +380,7 @@ } private static final Type[] TYPES = new Type[] { Hibernate.STRING }; - private static final String[] NAMES = new String[] { "name" }; + private static final String[] NAMES = new String[] { "name" }; //$NON-NLS-1$ private static final boolean[] MUTABILITY = new boolean[] { true }; private static final boolean[] GENERATION = new boolean[] { false }; @@ -416,7 +416,7 @@ * @see EntityPersister#getIdentifierPropertyName() */ public String getIdentifierPropertyName() { - return "id"; + return "id"; //$NON-NLS-1$ } /** @@ -437,15 +437,15 @@ * @see EntityPersister#getRootEntityName() */ public String getRootEntityName() { - return "CUSTOMS"; + return "CUSTOMS"; //$NON-NLS-1$ } public Serializable[] getPropertySpaces() { - return new String[] { "CUSTOMS" }; + return new String[] { "CUSTOMS" }; //$NON-NLS-1$ } public Serializable[] getQuerySpaces() { - return new String[] { "CUSTOMS" }; + return new String[] { "CUSTOMS" }; //$NON-NLS-1$ } /** @@ -490,7 +490,7 @@ public Object createProxy(Serializable id, SessionImplementor session) throws HibernateException { - throw new UnsupportedOperationException("no proxy for this class"); + throw new UnsupportedOperationException("no proxy for this class"); //$NON-NLS-1$ } public Object getCurrentVersion( Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/DoubleStringType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/DoubleStringType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/DoubleStringType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -66,7 +66,7 @@ } public String[] getPropertyNames() { - return new String[] { "s1", "s2" }; + return new String[] { "s1", "s2" }; //$NON-NLS-1$ //$NON-NLS-2$ } public Type[] getPropertyTypes() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Foo.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Foo.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Foo.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -85,12 +85,12 @@ } public boolean onSave(Session db) throws CallbackException { - _string = "a string"; + _string = "a string"; //$NON-NLS-1$ _date = new Date(123); _timestamp = new Date( System.currentTimeMillis() ); _integer = new Integer( -666 ); _long = new Long( 696969696969696969l - count++ ); - _short = new Short("42"); + _short = new Short("42"); //$NON-NLS-1$ _float = new Float( 6666.66f ); //_double = new Double( 1.33e-69 ); // this double is too big for the sap db jdbc driver _double = new Double( 1.12e-36 ); @@ -100,15 +100,15 @@ _char = '@'; _bytes = _string.getBytes(); Struct s = new Struct(); - s.name="name"; + s.name="name"; //$NON-NLS-1$ s.count = 69; blob = s; - binary = ( _string + "yada yada yada" ).getBytes(); - custom = new String[] { "foo", "bar" }; - component = new FooComponent("foo", 12, new Date[] { _date, _timestamp, null, new Date() }, new FooComponent("bar", 666, new Date[] { new Date(123456l), null }, null ) ); + binary = ( _string + "yada yada yada" ).getBytes(); //$NON-NLS-1$ + custom = new String[] { "foo", "bar" }; //$NON-NLS-1$ //$NON-NLS-2$ + component = new FooComponent("foo", 12, new Date[] { _date, _timestamp, null, new Date() }, new FooComponent("bar", 666, new Date[] { new Date(123456l), null }, null ) ); //$NON-NLS-1$ //$NON-NLS-2$ component.setGlarch( new Glarch() ); dependent = new Fee(); - dependent.setFi( "belongs to foo # " + getKey() ); + dependent.setFi( "belongs to foo # " + getKey() ); //$NON-NLS-1$ theLocale = Locale.getDefault(); return NO_VETO; } @@ -239,7 +239,7 @@ } public String toString() { - return this.getClass().getName() + ": " + key; + return this.getClass().getName() + ": " + key; //$NON-NLS-1$ } public void disconnect() { @@ -330,7 +330,7 @@ return null; } public void setNullComponent(FooComponent fc) throws Exception { - if (fc!=null) throw new Exception("Null component"); + if (fc!=null) throw new Exception("Null component"); //$NON-NLS-1$ } public Character getChar() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/FooComponent.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/FooComponent.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/FooComponent.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -25,16 +25,16 @@ } public String toString() { - String result = "FooComponent: " + name + "=" + count; - result+="; dates=["; + String result = "FooComponent: " + name + "=" + count; //$NON-NLS-1$ //$NON-NLS-2$ + result+="; dates=["; //$NON-NLS-1$ if ( importantDates!=null) { for ( int i=0; i<importantDates.length; i++ ) { - result+=(i==0 ?"":", ") + importantDates[i]; + result+=(i==0 ?"":", ") + importantDates[i]; //$NON-NLS-1$ //$NON-NLS-2$ } } - result+="]"; + result+="]"; //$NON-NLS-1$ if ( subcomponent!=null ) { - result+= " (" + subcomponent + ")"; + result+= " (" + subcomponent + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } return result; } @@ -88,7 +88,7 @@ return null; } private void setNull(String str) throws Exception { - if (str!=null) throw new Exception("null component property"); + if (str!=null) throw new Exception("null component property"); //$NON-NLS-1$ } public Fee getFee() { return fee; Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Fum.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Fum.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Fum.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -35,10 +35,10 @@ FumCompositeID fid = new FumCompositeID(); fid.setDate( new Date() ); fid.setShort( (short) ( id.short_ + 33 ) ); - fid.setString( id.string_ + "dd" ); + fid.setString( id.string_ + "dd" ); //$NON-NLS-1$ Fum f = new Fum(); f.id = fid; - f.fum="FRIEND"; + f.fum="FRIEND"; //$NON-NLS-1$ friends.add(f); } public String getFum() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Glarch.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Glarch.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Glarch.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -101,14 +101,14 @@ } public void onLoad(Session s, Serializable id) { - if ( ! ( ( (String) id ).length()==32 ) ) throw new RuntimeException("id problem"); + if ( ! ( ( (String) id ).length()==32 ) ) throw new RuntimeException("id problem"); //$NON-NLS-1$ } public boolean onSave(Session s) throws CallbackException { dynaBean = new HashMap(); - dynaBean.put("foo", "foo"); - dynaBean.put("bar", new Integer(66)); - immutable="never changes!"; + dynaBean.put("foo", "foo"); //$NON-NLS-1$ //$NON-NLS-2$ + dynaBean.put("bar", new Integer(66)); //$NON-NLS-1$ + immutable="never changes!"; //$NON-NLS-1$ return NO_VETO; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Master.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Master.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Master.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -14,10 +14,10 @@ private Set moreDetails = new HashSet(); private Set incoming = new HashSet(); private Set outgoing = new HashSet(); - private String name="master"; + private String name="master"; //$NON-NLS-1$ private Date stamp; private int version; - private BigDecimal bigDecimal = new BigDecimal("1234.123"); + private BigDecimal bigDecimal = new BigDecimal("1234.123"); //$NON-NLS-1$ private int x; private Collection allDetails; Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/MultiplicityType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/MultiplicityType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/MultiplicityType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -16,7 +16,7 @@ public class MultiplicityType implements CompositeUserType { private static final String[] PROP_NAMES = new String[] { - "count", "glarch" + "count", "glarch" //$NON-NLS-1$ //$NON-NLS-2$ }; private static final int[] SQL_TYPES = new int[] { Hibernate.INTEGER.sqlType(), Hibernate.STRING.sqlType() Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Qux.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Qux.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Qux.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -43,7 +43,7 @@ catch (Exception e) { throw new CallbackException(e); } - foo.setString("child of a qux"); + foo.setString("child of a qux"); //$NON-NLS-1$ return NO_VETO; } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Simple.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Simple.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Simple.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -19,8 +19,8 @@ public Simple() {} public void init() { - name="Someone With Along Name"; - address="1234 Some Street, Some City, Victoria, 3000, Austraya"; + name="Someone With Along Name"; //$NON-NLS-1$ + address="1234 Some Street, Some City, Victoria, 3000, Austraya"; //$NON-NLS-1$ count=69; date=new java.sql.Date(666); number=new Float(55.8); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Top.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Top.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/legacy/Top.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -16,8 +16,8 @@ public Top() {} public void init() { - name="Someone With Along Name"; - address="1234 Some Street, Some City, Victoria, 3000, Austraya"; + name="Someone With Along Name"; //$NON-NLS-1$ + address="1234 Some Street, Some City, Victoria, 3000, Austraya"; //$NON-NLS-1$ count=69; date=new java.sql.Date(666); } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/mapcompelem/Part.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/mapcompelem/Part.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/mapcompelem/Part.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -32,6 +32,6 @@ return name.hashCode(); } public String toString() { - return name + ":" + description; + return name + ":" + description; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/joined/Address.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/joined/Address.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/joined/Address.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -11,6 +11,6 @@ public String zip; public String toString() { - return this.getClass() + ":" + street; + return this.getClass() + ":" + street; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/optional/Address.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/optional/Address.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/onetoone/optional/Address.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -10,6 +10,6 @@ public String zip; public String toString() { - return this.getClass() + ":" + street; + return this.getClass() + ":" + street; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/proxy/DataPoint.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/proxy/DataPoint.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/proxy/DataPoint.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -72,6 +72,6 @@ } void exception() throws Exception { - throw new Exception("foo"); + throw new Exception("foo"); //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/typeparameters/DefaultValueIntegerType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/typeparameters/DefaultValueIntegerType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/typeparameters/DefaultValueIntegerType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -73,7 +73,7 @@ } public void setParameterValues(Properties parameters) { - this.defaultValue = Integer.valueOf((String) parameters.get("default")); + this.defaultValue = Integer.valueOf((String) parameters.get("default")); //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/unionsubclass/Human.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/unionsubclass/Human.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/unionsubclass/Human.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -20,7 +20,7 @@ this.sex = sex; } public String getSpecies() { - return "human"; + return "human"; //$NON-NLS-1$ } } Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/basic/MyListType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/basic/MyListType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/basic/MyListType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -20,7 +20,7 @@ public PersistentCollection wrap(SessionImplementor session, Object collection) { if ( session.getEntityMode()==EntityMode.DOM4J ) { - throw new IllegalStateException("dom4j not supported"); + throw new IllegalStateException("dom4j not supported"); //$NON-NLS-1$ } else { return new PersistentMyList( session, (IMyList) collection ); Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/parameterized/DefaultableListType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/parameterized/DefaultableListType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/usercollection/parameterized/DefaultableListType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -36,7 +36,7 @@ public PersistentCollection wrap(SessionImplementor session, Object collection) { if ( session.getEntityMode() == EntityMode.DOM4J ) { - throw new IllegalStateException( "dom4j not supported" ); + throw new IllegalStateException( "dom4j not supported" ); //$NON-NLS-1$ } else { return new PersistentDefaultableList( session, ( List ) collection ); @@ -70,7 +70,7 @@ } public void setParameterValues(Properties parameters) { - defaultValue = parameters.getProperty( "default" ); + defaultValue = parameters.getProperty( "default" ); //$NON-NLS-1$ } public Object instantiate() { Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/where/NumericTrueFalseType.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/where/NumericTrueFalseType.java 2008-06-04 13:37:30 UTC (rev 8539) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/where/NumericTrueFalseType.java 2008-06-04 13:49:02 UTC (rev 8540) @@ -40,7 +40,7 @@ } public String objectToSQLString(Object value, Dialect dialect) throws Exception { - return ( ( Boolean ) value ).booleanValue() ? "1" : "0"; + return ( ( Boolean ) value ).booleanValue() ? "1" : "0"; //$NON-NLS-1$ //$NON-NLS-2$ } public int sqlType() { @@ -48,6 +48,6 @@ } public String getName() { - return "numeric_boolean"; + return "numeric_boolean"; //$NON-NLS-1$ } }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8539 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml: images and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-04 09:37:30 -0400 (Wed, 04 Jun 2008) New Revision: 8539 Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/images/ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/images/pages/ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/images/pages/page.gif Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta Log: 1) added icon resource images/pages/page.gif; folder images included to build path 2) modified main.seam-pages.page definition in meta.xml to refer to new resource 3) main icon reference in entities SeamPage12, SeamPage20 and SeamPagesProcessItem set is to main.seam-pages.page (SeamPage12, SeamPage20 are entities for initial xml, I decided that it may be good for them to have the same icon as page on diagram) Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties 2008-06-04 13:11:12 UTC (rev 8538) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties 2008-06-04 13:37:30 UTC (rev 8539) @@ -6,7 +6,8 @@ about.html,\ dtds/,\ seam-pages-xml.jar,\ - schemas/ + schemas/,\ + images/ jars.compile.order = seam-pages-xml.jar src.includes = dtds/,\ src/,\ @@ -16,4 +17,5 @@ plugin.properties,\ build.properties,\ about.html,\ - META-INF/ + META-INF/,\ + images/ Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/images/pages/page.gif =================================================================== (Binary files differ) Property changes on: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/images/pages/page.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-04 13:11:12 UTC (rev 8538) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-04 13:37:30 UTC (rev 8539) @@ -36,7 +36,7 @@ <ICON name="file" path="images/jsf/jsf-config.gif"/> <ICON name="message" path="images/webxml/message.gif"/> <ICON name="navigation" path="images/struts/action_mappings.gif"/> - <ICON name="page" path="images/struts/plug_in.gif"/> + <ICON name="page" path="plugin:org.jboss.tools.seam.pages.xml:images/pages/page.gif"/> <ICON name="pages" path="images/struts/plug_in_folder.gif"/> <ICON name="property" path="images/java/property.gif"/> <ICON name="redirect" path="images/jsf/transition.gif"/> @@ -647,7 +647,7 @@ </XChildrenEntities> <XEntityRenderer> <ICONS> - <ICON info="main.seam.component" type="main"/> + <ICON info="main.seam-pages.page" type="main"/> </ICONS> </XEntityRenderer> <XModelAttributes> @@ -808,7 +808,7 @@ </XChildrenEntities> <XEntityRenderer> <ICONS> - <ICON info="main.seam.component" type="main"/> + <ICON info="main.seam-pages.page" type="main"/> </ICONS> </XEntityRenderer> <XModelAttributes> @@ -2882,7 +2882,7 @@ </XChildrenEntities> <XEntityRenderer> <ICONS> - <ICON info="main.file.jsp_file" type="main"/> + <ICON info="main.seam-pages.page" type="main"/> </ICONS> </XEntityRenderer> <XModelAttributes>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8538 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-06-04 09:11:12 -0400 (Wed, 04 Jun 2008) New Revision: 8538 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java Log: Implements http://jira.jboss.com/jira/browse/JBIDE-2227 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-06-04 12:59:40 UTC (rev 8537) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-06-04 13:11:12 UTC (rev 8538) @@ -8,11 +8,15 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ + + package org.jboss.tools.vpe.ui.test; + import junit.framework.TestCase; import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; @@ -21,245 +25,259 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMDocument; + /** + * The Class VpeTest. + * * @author Max Areshkau * * Base Class for VPE tests */ public class VpeTest extends TestCase implements ILogListener { - /** - * Editor in which we open visual page - */ - protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ - /** - * Collects exceptions - */ - private Throwable exception; + /** Collects exceptions. */ + private Throwable exception; - /** - * check warning log - * @default false - */ - private boolean checkWarning = false; + /** check warning log. */ + private boolean checkWarning = false; - //FIX for JBIDE-1628 - static { - ClassLoaderUtil.init(); - //wait for initialization - TestUtil.delay(3000); - } - /** - * - * @param name - * @param importProjectName - */ + // FIX for JBIDE-1628 + static { + ClassLoaderUtil.init(); + // wait for initialization + TestUtil.delay(3000); + } - public VpeTest(String name) { - super(name); + /** + * The Constructor. + * + * @param importProjectName * @param name the name + */ - } + public VpeTest(String name) { + super(name); - /** - * Perform pre-test initialization. - * - * @throws Exception - * - * @see TestCase#setUp() - */ - protected void setUp() throws Exception { - super.setUp(); + } - Platform.addLogListener(this); -// String jbossPath = System.getProperty("jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); -// JBossASAdapterInitializer.initJBossAS(jbossPath, new NullProgressMonitor()); - closeEditors(); - } + /** + * Perform pre-test initialization. + * + * @throws Exception the exception + * + * @see TestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); - /** - * Perform post-test cleanup. - * - * @throws Exception - * - * @see TestCase#tearDown() - */ - protected void tearDown() throws Exception { + Platform.addLogListener(this); + // String jbossPath = System.getProperty( + // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); + // JBossASAdapterInitializer.initJBossAS(jbossPath, new + // NullProgressMonitor()); + closeEditors(); + } - super.tearDown(); + /** + * Perform post-test cleanup. + * + * @throws Exception the exception + * + * @see TestCase#tearDown() + */ + protected void tearDown() throws Exception { - closeEditors(); + super.tearDown(); - Platform.removeLogListener(this); + closeEditors(); - } + Platform.removeLogListener(this); - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, - * java.lang.String) - */ - public void logging(IStatus status, String plugin) { - switch (status.getSeverity()) { - case IStatus.ERROR: - setException(status.getException()); - break; - case IStatus.WARNING: - if (isCheckWarning()) - setException(status.getException()); - break; - default: - break; - } + } - } + /* + * (non-Javadoc) + * + * @see + * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime + * .IStatus, java.lang.String) + */ + /** + * Logging. + * + * @param status the status + * @param plugin the plugin + */ + public void logging(IStatus status, String plugin) { + switch (status.getSeverity()) { + case IStatus.ERROR: + setException(status.getException()); + break; + case IStatus.WARNING: + if (isCheckWarning()) + setException(status.getException()); + break; + default: + break; + } - /** - * close all opened editors - */ - protected void closeEditors() { + } - // wait - TestUtil.waitForJobs(); + /** + * close all opened editors. + */ + protected void closeEditors() { - // close - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .closeAllEditors(false); + // wait + TestUtil.waitForJobs(); - } + // close + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); - /** - * get xulrunner source page - * - * @param part - - * JSPMultiPageEditor - * @return nsIDOMDocument - */ - protected nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) { + } - VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - - VpeController vpeController = visualEditor.getController(); + /** + * get xulrunner source page. + * + * @param part - JSPMultiPageEditor + * + * @return nsIDOMDocument + */ + protected nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) { - // get xulRunner editor - XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor(); + VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - // get dom document - nsIDOMDocument document = xulRunnerEditor.getDOMDocument(); + VpeController vpeController = visualEditor.getController(); - return document; - } - - /** - * Gets visual page editor controller - * @param part - * @return {@link VpeController} - */ - protected VpeController getVpeController(JSPMultiPageEditor part) { - - VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - - return visualEditor.getController(); - } + // get xulRunner editor + XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor(); - /** - * Perfoms test for some page - * - * @param componentPage - * @throws PartInitException - * @throws Throwable - */ - protected void performTestForVpeComponent(IFile componentPage) - throws PartInitException, Throwable { - TestUtil.waitForJobs(); + // get dom document + nsIDOMDocument document = xulRunnerEditor.getDOMDocument(); - setException(null); + return document; + } - // IFile file = (IFile) - // TestUtil.getComponentPath(componentPage,getImportProjectName()); - IEditorInput input = new FileEditorInput(componentPage); + /** + * Gets visual page editor controller. + * + * @param part the part + * + * @return {@link VpeController} + */ + protected VpeController getVpeController(JSPMultiPageEditor part) { - TestUtil.waitForJobs(); + VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - IEditorPart editor = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().openEditor(input, - EDITOR_ID, true); + return visualEditor.getController(); + } - assertNotNull(editor); + /** + * Perfoms test for some page. + * + * @param componentPage the component page + * + * @throws Throwable the throwable + * @throws PartInitException the part init exception + */ + protected void performTestForVpeComponent(IFile componentPage) throws PartInitException, Throwable { + TestUtil.waitForJobs(); - TestUtil.waitForJobs(); - TestUtil.delay(1000); + setException(null); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .closeAllEditors(true); + // IFile file = (IFile) + // TestUtil.getComponentPath(componentPage,getImportProjectName()); + IEditorInput input = new FileEditorInput(componentPage); - if (getException() != null) { - throw getException(); - } - } + TestUtil.waitForJobs(); - /** - * Open JSPMultiPageEditor editor - * - * @param input - * @return - * @throws PartInitException - */ - protected JSPMultiPageEditor openEditor(IEditorInput input) - throws PartInitException { + IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, EDITOR_ID, true); - // get editor - JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI - .getWorkbench().getActiveWorkbenchWindow().getActivePage() - .openEditor(input, EDITOR_ID, true); + assertNotNull(editor); - assertNotNull(part); - // wait for jobs - //TestUtil.waitForJobs(); - // wait full initialization of vpe - // commented by dgolovin to get rid of jvm error [libexpat.so.0+0xeff4] - //TestUtil.delay(1000); + TestUtil.waitForJobs(); + TestUtil.delay(1000); - return part; + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(true); - } + if (getException() != null) { + throw getException(); + } + } - /** - * @return the exception - */ - protected Throwable getException() { - return exception; - } + /** + * Open JSPMultiPageEditor editor. + * + * @param input the input + * + * @return the JSP multi page editor + * + * @throws PartInitException the part init exception + */ + protected JSPMultiPageEditor openEditor(IEditorInput input) throws PartInitException { - /** - * @param exception - * the exception to set - */ - protected void setException(Throwable exception) { - this.exception = exception; - } + // get editor + JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( + input, EDITOR_ID, true); - /** - * @return the checkWarning - */ - protected boolean isCheckWarning() { - return checkWarning; - } + assertNotNull(part); + // wait for jobs + // TestUtil.waitForJobs(); + // wait full initialization of vpe + // commented by dgolovin to get rid of jvm error [libexpat.so.0+0xeff4] + // TestUtil.delay(1000); - /** - * @param checkWarning - * the checkWarning to set - */ - protected void setCheckWarning(boolean checkWarning) { - this.checkWarning = checkWarning; - } + return part; + } + + /** + * Gets the exception. + * + * @return the exception + */ + protected Throwable getException() { + return exception; + } + + /** + * Sets the exception. + * + * @param exception the exception to set + */ + protected void setException(Throwable exception) { + this.exception = exception; + } + + /** + * Checks if is check warning. + * + * @return the checkWarning + */ + protected boolean isCheckWarning() { + return checkWarning; + } + + /** + * Sets the check warning. + * + * @param checkWarning the checkWarning to set + */ + protected void setCheckWarning(boolean checkWarning) { + this.checkWarning = checkWarning; + } + + + }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8537 - in trunk/seam/tests/org.jboss.tools.seam.ui.test: projects/TestSeamELContentAssist/WebContent and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-06-04 08:59:40 -0400 (Wed, 04 Jun 2008) New Revision: 8537 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withEl.xhtml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withoutEl.xhtml trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF Log: Test cases for http://jira.jboss.com/jira/browse/JBIDE-2227 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2008-06-04 12:37:06 UTC (rev 8536) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2008-06-04 12:59:40 UTC (rev 8537) @@ -36,7 +36,8 @@ org.eclipse.datatools.connectivity, org.jboss.tools.jst.jsp, org.jboss.tools.jst.jsp.test, - org.eclipse.jdt.ui + org.eclipse.jdt.ui, + org.jboss.tools.vpe.ui.test;bundle-version="1.0.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.view, org.jboss.tools.seam.ui.test.wizard Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withEl.xhtml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withEl.xhtml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withEl.xhtml 2008-06-04 12:59:40 UTC (rev 8537) @@ -0,0 +1,12 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + mlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.ajax4jsf.org/rich" + template="layout/template.xhtml"> +<ui:define name="body"> + <h:outputText value=""/> +</ui:define> +</ui:composition> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withEl.xhtml ___________________________________________________________________ Name: svn:mime-type + text/html Name: svn:eol-style + native Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withoutEl.xhtml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withoutEl.xhtml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withoutEl.xhtml 2008-06-04 12:59:40 UTC (rev 8537) @@ -0,0 +1,34 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.ajax4jsf.org/rich" + template="layout/template.xhtml"> + +<ui:define name="body"> + + <h:messages styleClass="message"/> + + <h:form id="login"> + + <rich:panel> + <f:facet name="header">Login</f:facet> + + <p>Please login using any username and password</p> + + + + </rich:panel> + + <div class="actionButtons"> + <h:commandButton value="Login" action="#{identity.login}"/> + <s:button view="/home.xhtml" value="Home Button" /> + <s:link view="/home.xhtml" value="Home Link" /> + </div> + </h:form> + + </ui:define> +</ui:composition> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/jbide2227/withoutEl.xhtml ___________________________________________________________________ Name: svn:mime-type + text/html Name: svn:eol-style + native Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java 2008-06-04 12:59:40 UTC (rev 8537) @@ -0,0 +1,180 @@ + + +package org.jboss.tools.seam.ui.test.jbide; + + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.text.contentassist.IContentAssistant; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.vpe.ui.test.TestUtil; + + +/** + * The Class JBide2227TestCase. + */ +public class JBide2227TestCase extends ContentAssistantTestCase { + + /** The Constant IMPORT_PROJECT_NAME. */ + private static final String IMPORT_PROJECT_NAME = "TestSeamELContentAssist"; + + /** The Constant PAGE_1. */ + private static final String PAGE_1 = "/WebContent/jbide2227/withEl.xhtml"; + + /** The Constant CA_NAME. */ + private static final String CA_NAME = "org.eclipse.wst.html.HTML_DEFAULT"; + + /** The provider. */ + private TestProjectProvider provider; + + /** The project. */ + private IProject project; + + /** The make copy. */ + private boolean makeCopy; + + /** The Constant PAGE_2. */ + private static final String PAGE_2 = "/WebContent/jbide2227/withoutEl.xhtml"; + + + /** + * The Constructor. + */ + public JBide2227TestCase() { + super(); + } + + /** + * Suite. + * + * @return the test + */ + public static Test suite() { + return new TestSuite(JBide2227TestCase.class); + } + + /** + * Sets the up. + * + * @throws Exception the exception + */ + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, IMPORT_PROJECT_NAME, makeCopy); + project = provider.getProject(); + Throwable exception = null; + try { + project.refreshLocal(IResource.DEPTH_INFINITE, null); + } catch (Exception x) { + exception = x; + x.printStackTrace(); + } + assertNull("An exception caught: " + (exception != null ? exception.getMessage() : ""), exception); + } + + /** + * Tear down. + * + * @throws Exception the exception + */ + protected void tearDown() throws Exception { + if (provider != null) { + provider.dispose(); + } + } + + /** + * Test content assist with el. + * + * @throws Throwable the throwable + */ + public void testContentAssistWithEl() throws Throwable { + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + // Tests CA + + check(CA_NAME, PAGE_1, 576, 114); + + // check exception + if (getException() != null) { + + throw getException(); + } + } + + /** + * Base checkof CA. + * + * @param testPagePath the test page path + * @param position the position + * @param caName the ca name + * @param numberOfProposals the number of proposals + * + * @throws CoreException the core exception + */ + protected void check(String caName, String testPagePath, int position, int numberOfProposals) throws CoreException { + // get test page path + IFile file = project.getFile(testPagePath); + assertNotNull("Could not open specified file " + file.getFullPath(), file); + + IEditorInput input = new FileEditorInput(file); + + assertNotNull("Editor input is null", input); + + // open and get editor + JSPMultiPageEditor part = openEditor(input); + + // sets cursor position + part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(position); + TestUtil.waitForJobs(); + TestUtil.delay(2000); + SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part.getSourceEditor()) + .getSourceViewerConfigurationForTest(); + // errase errors which can be on start of editor(for example xuklunner + // not found) + setException(null); + StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration; + IContentAssistant iContentAssistant = stvc.getContentAssistant((ISourceViewer) part.getSourceEditor().getAdapter( + ISourceViewer.class)); + assertNotNull(iContentAssistant); + IContentAssistProcessor iContentAssistProcessor = iContentAssistant.getContentAssistProcessor(caName); + assertNotNull(iContentAssistProcessor); + ICompletionProposal[] results = iContentAssistProcessor + .computeCompletionProposals(part.getSourceEditor().getTextViewer(), position); + assertNotNull(results); + assertEquals(numberOfProposals, results.length); + + closeEditors(); + TestUtil.delay(1000L); + } + + /** + * Test content assist without el. + * + * @throws Throwable the throwable + */ + public void testContentAssistWithoutEl() throws Throwable { + TestUtil.waitForJobs(); + + setException(null); + + check(CA_NAME, PAGE_2, 580, 11); + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8536 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-06-04 08:37:06 -0400 (Wed, 04 Jun 2008) New Revision: 8536 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: JBIDE-2293 Default facet for JBoss 4.2 Runtime isn't defined correctly Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-06-04 11:59:32 UTC (rev 8535) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-06-04 12:37:06 UTC (rev 8536) @@ -533,6 +533,10 @@ id="jst.java" version="5.0"> </facet> + <facet + id="jst.jsf" + version="1.2"> + </facet> <facet id="jst.seam" version="1.2">

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8535 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-04 07:59:32 -0400 (Wed, 04 Jun 2008) New Revision: 8535 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2008-06-04 11:32:04 UTC (rev 8534) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2008-06-04 11:59:32 UTC (rev 8535) @@ -152,6 +152,9 @@ //TODO implement registering/unregistering error children public void replaceChildren(XModelObject[] objects) { + for (int i = 0; i < objects.length; i++) { + ((XModelObjectImpl)objects[i]).setParent_0(this); + } children.replaceChildren(objects); changeTimeStamp(); }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8534 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-04 07:32:04 -0400 (Wed, 04 Jun 2008) New Revision: 8534 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/OrderedChildren.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/OrderedChildren.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/OrderedChildren.java 2008-06-04 11:16:48 UTC (rev 8533) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/OrderedChildren.java 2008-06-04 11:32:04 UTC (rev 8534) @@ -93,7 +93,11 @@ public void replaceChildren(XModelObject[] objects) { super.replaceChildren(objects); synchronized (this) { - alist = Arrays.asList(objects); + ArrayList<XModelObject> n = new ArrayList<XModelObject>(); + for (int i = 0; i < objects.length; i++) { + n.add(objects[i]); + } + alist = n; list = null; } }

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2008