Author: mareshkau Date: 2008-11-28 12:55:49 -0500 (Fri, 28 Nov 2008) New Revision: 12137 Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JBIDE-2773 Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-11-28 17:19:43 UTC (rev 12136) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-11-28 17:55:49 UTC (rev 12137) @@ -49,7 +49,7 @@ */ @Override protected String getEntity() { - return (file != null) ? "VPEGlobalElReference" : "VPEGlobalElReferenceExt"; + return "VPEGlobalElReference"; } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-11-28 17:19:43 UTC (rev 12136) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-11-28 17:55:49 UTC (rev 12137) @@ -8,9 +8,6 @@ VPETLDReference_AddItem.Title=Add TLD Item VPETLDReference_EditItem.Title=Edit TLD Item -VPEElReference_AddItem.Title=Add El Item -VPEElReference_EditItem.Title=Edit EL Item - VpeImageReferencesDialog.WindowTitle=References to Images Files VpeImageReferencesDialog.Title=Visual Page Editor VPEImageReference.location=Path to Folder @@ -20,20 +17,18 @@ VPEElReference.location=El Value VPEElReference.prefix=Value +VPEElReferenceEditItem.Title=Edit El Item Title +VPEElReferenceEditItem.Message=Edit El variable, which is substituted in a visual part for generating a preview +VPEElReferenceAddItem.Message=Add El variable, which will be substituted in a visual part for generating a preview +VPEElReferenceAddItem.Title=Add El Item -VPEElReferenceExt.location=El Value -VPEElReferenceExt.prefix=Value - VPEGlobalElReference.location=El Value VPEGlobalElReference.prefix=Value -VPEGlobalElReference_AddItem.Title=Add El Item -VPEGlobalElReference_EditItem.Title=Edit EL Item +VPEGlobalElReferenceAddItem.Title=Add El Item +VPEGlobalElReferenceEditItem.Title=Edit EL Item +VPEGlobalElReferenceAddItem.Message=Add global El variable, which will be substituted in a visual part for generating a preview +VPEGlobalElReferenceEditItem.Message=Edit global El variable, which is substituted in a visual part for generating a preview -VPEGlobalElReferenceExt.location=El Value -VPEGlobalElReferenceExt.prefix=Value -VPEGlobalElReferenceExt_AddItem.Title=Add El Item -VPEGlobalElReferenceExt_EditItem.Title=Edit EL Item - VpeResourcesDialog.WindowTitle=References to Resources VpeResourcesDialog.Title=Page Design Options Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-11-28 17:19:43 UTC (rev 12136) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-11-28 17:55:49 UTC (rev 12137) @@ -138,7 +138,8 @@ <XActionItem kind="list"> <XActionItem kind="list" name="CreateActions"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" + PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, + key=VPEElReferenceAddItem" displayName="Add El Reference..." kind="action" name="AddItem"> <EntityData EntityName="VPEElReference"> <AttributeData AttributeName="location"/> @@ -149,7 +150,8 @@ </XActionItem> <XActionItem kind="list" name="EditActions"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" + PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, + key=VPEElReferenceEditItem" displayName="Edit El Reference..." kind="action" name="EditItem"> <EntityData EntityName="VPEElReference"> <AttributeData AttributeName="location"/> @@ -162,62 +164,7 @@ <XDependencies/> </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEElReferenceExt"> - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"/> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page: Only This Page"/> - <value name="Folder: Any Page at the Same Folder"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEElReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" - displayName="Edit El Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEElReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <!-- --> - - - - - <!-- Added by estherbin https://jira.jboss.org/jira/browse/JBIDE-2594 --> <XModelEntity ImplementingClass="%Regular%" name="VPEGlobalElReference"> @@ -228,59 +175,11 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"> - <value name="Global: For all projects in workspace"/> - </Constraint> - <Editor/> - </XModelAttribute> - <XModelAttribute name="prefix"> - <Constraint/> - <Editor/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEGlobalElReference"> - <AttributeData AttributeName="location" Mandatory="no"/> - <!--AttributeData AttributeName="scope" Mandatory="no"/--> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" - displayName="Edit El Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEGlobalElReference"> - <AttributeData AttributeName="location"/> - <!--AttributeData AttributeName="scope" Mandatory="no"/--> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - - <XModelEntity ImplementingClass="%Regular%" name="VPEGlobalElReferenceExt"> - - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> + <XModelAttribute name="location" xmlname="location"> <Constraint/> <Editor/> </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" + <XModelAttribute PROPERTIES="border=true" default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> <Constraint loader="ListString"> <value name="Global: For all projects in workspace"/> @@ -295,9 +194,10 @@ <XActionItem kind="list"> <XActionItem kind="list" name="CreateActions"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" + PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, + key=VPEGlobalElReferenceAddItem" displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEGlobalElReferenceExt"> + <EntityData EntityName="VPEGlobalElReference"> <AttributeData AttributeName="location"/> <AttributeData AttributeName="scope" Mandatory="no"/> <AttributeData AttributeName="prefix" Mandatory="no"/> @@ -306,9 +206,10 @@ </XActionItem> <XActionItem kind="list" name="EditActions"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport" + PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeELReferenceSupport, + key=VPEGlobalElReferenceEditItem" displayName="Edit El Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEGlobalElReferenceExt"> + <EntityData EntityName="VPEGlobalElReference"> <AttributeData AttributeName="location"/> <AttributeData AttributeName="scope" Mandatory="no"/> <AttributeData AttributeName="prefix" Mandatory="no"/> @@ -318,11 +219,8 @@ </XActionItem> <XDependencies/> </XModelEntity> - <!-- --> + - - - <XModelEntity ImplementingClass="%Regular%" name="VPEFolderReference"> <XChildrenEntities/> <XEntityRenderer> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-28 17:19:43 UTC (rev 12136) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-28 17:55:49 UTC (rev 12137) @@ -3119,7 +3119,7 @@ // synced = false; return; } - // TODO Max Areshkau Adjust this code, now we haven's source mode + if (editPart.getVisualMode() != VpeEditorPart.SOURCE_MODE) { if (toolbarFormatControllerManager != null) toolbarFormatControllerManager.selectionChanged(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2008-11-28 17:19:43 UTC (rev 12136) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2008-11-28 17:55:49 UTC (rev 12137) @@ -34,7 +34,7 @@ */ @Override protected String getEntity() { - return (file != null) ? "VPEElReference" : "VPEElReferenceExt"; //$NON-NLS-1$//$NON-NLS-2$ + return "VPEElReference"; } /**c