Author: dmaliarevich Date: 2009-08-20 08:12:24 -0400 (Thu, 20 Aug 2009) New Revision: 17183 Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 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/CSSReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.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.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4547, Add Global EL resource reference dialog was remade, vpe.meta was deleted, license notes were added to new classes, EL preference page was updated. Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2009-08-20 12:12:24 UTC (rev 17183) @@ -17,3 +17,4 @@ org.jboss.tools.common.model.ui;bundle-version="2.0.0" Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.jboss.tools.vpe.resref.core 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 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -13,12 +13,15 @@ import java.util.List; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.el.core.GlobalELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.common.resref.core.ResourceReferenceList; -import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; -import org.jboss.tools.common.resref.ui.BaseAddReferenceSupport; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; +import org.jboss.tools.vpe.resref.core.AbstractResourceReferencesComposite; +import org.jboss.tools.vpe.resref.core.GlobalELReferenceWizardDialog; +import org.jboss.tools.vpe.resref.core.ReferenceWizardDialog; /** @@ -29,14 +32,6 @@ public class GlobalElVariablesComposite extends AbstractResourceReferencesComposite { /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return ""; //$NON-NLS-1$ - } - - /** * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createTableProvider(java.util.List) */ @Override @@ -45,14 +40,6 @@ } /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getEntity() - */ - @Override - protected String getEntity() { - return "VPEGlobalElReference"; //$NON-NLS-1$ - } - - /** * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getReferenceList() */ @Override @@ -66,25 +53,41 @@ rf.setGlobal(true); return rf; } + + protected ReferenceWizardDialog getDialog(ResourceReference resref) { + return new GlobalELReferenceWizardDialog( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), fileLocation, resref, getReferenceArray()); + } @Override protected void add(int index) { - ResourceReference defaultRef = getDefaultResourceReference(); - - boolean ok = BaseAddReferenceSupport.add(file, defaultRef, getReferenceArray(), getEntity()); - if(!ok) return; - dataList.add(defaultRef); - update(); - table.setSelection(dataList.size() - 1); + ResourceReference resref = getDefaultResourceReference(); + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + dataList.add(resref); + update(); + table.setSelection(dataList.size() - 1); + } } @Override protected void edit(int index) { - if(index < 0) return; - ResourceReference defaultRef = getReferenceArray()[index]; - boolean ok = BaseAddReferenceSupport.edit(file, defaultRef, getReferenceArray(), getEntity()); - if(!ok) return; - update(); + if(index < 0) { + return; + } + ResourceReference resref = getReferenceArray()[index]; + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + update(); + } } } Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,483 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" "meta.dtd"> -<XModelEntityGroup> - <VERSION MODULE="VPE" VERSION="1.0"/> - <MAPPINGS/> - <ICONS/> - <GlobalActions kind="list"/> - <XModelEntity ImplementingClass="%Regular%" name="VPECSSReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FILES_ONLY"/> - <value name="extensions=css"/> - </Constraint> - <Editor name="FileChooser"/> - </XModelAttribute> - <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"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceAddItem" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPECSSReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceEditItem" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPECSSReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPECSSReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FILES_ONLY"/> - <value name="extensions=css"/> - </Constraint> - <Editor name="FileChooser"/> - </XModelAttribute> - <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> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceAddItem" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPECSSReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport, key=VPECSSReferenceEditItem" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPECSSReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - - <!-- Added by estherbin //JBIDE-2010 --> - <XModelEntity ImplementingClass="%Regular%" name="VPEElReference"> - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint/> - <Editor/> - </XModelAttribute> - <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"/> - <value name="Project: Any Page at the Same Project"/> - </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, - key=VPEElReferenceAddItem" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEElReference"> - <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, - key=VPEElReferenceEditItem" - 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"> - - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint/> - <Editor/> - </XModelAttribute> - <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"/> - </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, - key=VPEGlobalElReferenceAddItem" - displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEGlobalElReference"> - <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, - key=VPEGlobalElReferenceEditItem" - 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="VPEFolderReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page"/> - <value name="Folder"/> - <value name="Project"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"/> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEFolderReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=*.css files"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <XModelAttribute PROPERTIES="border=true" - default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> - <Constraint loader="ListString"> - <value name="Page"/> - <value name="Folder"/> - </Constraint> - <Editor name="List"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"/> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEImageReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=images folder"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <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"/> - <value name="Project: Any Page at the Same Project"/> - </Constraint> - <Editor name="RadioArray"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEImageReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEImageReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPEImageReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="FileFilter"> - <value name="allFiles=false"/> - <value name="description=images folder"/> - <value name="mode=FOLDERS_ONLY"/> - </Constraint> - <Editor name="FolderChooser"/> - </XModelAttribute> - <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> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Add CSS Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPEImageReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem kind="list" name="EditActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport" - displayName="Edit CSS Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPEImageReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPETLDReference"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> - </XModelAttribute> - <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"/> - <value name="Project: Any Page at the Same Project"/> - </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.VpeTaglibReferenceSupport, key=VPETLDReferenceAddItem" - displayName="Add Taglib Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPETLDReference"> - <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.VpeTaglibReferenceSupport, key=VPETLDReferenceEditItem" - displayName="Edit Taglib Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPETLDReference"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Regular%" name="VPETLDReferenceExt"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="action.empty" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> - </XModelAttribute> - <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.VpeTaglibReferenceSupport, key=VPETLDReferenceAddItem" - displayName="Add TLD Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPETLDReferenceExt"> - <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.VpeTaglibReferenceSupport, key=VPETLDReferenceEditItem" - displayName="Edit TLD Reference..." kind="action" name="EditItem"> - <EntityData EntityName="VPETLDReferenceExt"> - <AttributeData AttributeName="location"/> - <AttributeData AttributeName="scope" Mandatory="no"/> - <AttributeData AttributeName="prefix" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> -</XModelEntityGroup> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -11,8 +11,6 @@ package org.jboss.tools.vpe.editor.preferences; -import java.util.Properties; - import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -23,7 +21,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.jboss.tools.common.el.ui.GlobalElVariablesComposite; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; /** * Page for the El preferences. @@ -34,7 +31,7 @@ public static final String ID = "org.jboss.tools.common.xstudio.elvariables"; //$NON-NLS-1$ /** The el. */ - private GlobalElVariablesComposite el = new GlobalElVariablesComposite(); + private GlobalElVariablesComposite el = new GlobalElVariablesComposite(); @Override protected void performApply() { @@ -67,8 +64,8 @@ layout.marginWidth = 0; layout.marginHeight = 0; c.setLayout(layout); - - setUpVariableComposite(el); + + el.setObject(Platform.getLocation()); data = new GridData(GridData.FILL_BOTH); final Control elControl = el.createControl(c); elControl.setLayoutData(data); @@ -84,25 +81,11 @@ @Override public boolean performOk() { boolean rst = super.performOk(); - el.commit(); return rst; } /** - * Sets the up variable composite. - * - * @param el the el - */ - private void setUpVariableComposite(GlobalElVariablesComposite el){ - final Properties p = new Properties(); - p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$ - p.put("path", Platform.getLocation()); //$NON-NLS-1$ - p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$ - el.setObject(p); - } - - /** * Init. * * @param workbench the workbench @@ -110,8 +93,9 @@ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ public void init(IWorkbench workbench) { - // TODO Auto-generated method stub - + /* + * Do nothing + */ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; public class CSSReferenceWizard extends ReferenceWizard { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.io.File; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.io.File; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.jboss.tools.common.resref.core.ResourceReference; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.util.HashMap; @@ -24,10 +34,6 @@ super(pageName, title, titleImage, fileLocation); } - public ELReferenceWizardPage(String pageName) { - super(pageName); - } - public void createControl(Composite parent) { Composite pageControl = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(2, false); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.util.Map; @@ -91,7 +101,7 @@ /* * When El name is not specified */ - errorMessage = "EL Name should be set."; + errorMessage = Messages.EL_NAME_SHOULD_BE_SET; pageComplete = false; } } 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 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.util.List; @@ -55,7 +65,6 @@ update(); table.setSelection(dataList.size() - 1); } - } Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.resref.core; + +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalELReferenceWizard extends ELReferenceWizard { + + public GlobalELReferenceWizard(Object fileLocation, String windowTitle, + ResourceReference[] resrefList) { + super(fileLocation, windowTitle, resrefList); + } + + @Override + protected void createPage() { + page = new GlobalElReferenceWizardPage(Messages.GLOBAL_EL_WIZARD_PAGE_NAME, + Messages.VRD_ADD_EL_PREFERENCE, ReferenceWizardPage + .getImageDescriptor(), fileLocation); + page.setDescription(Messages.ADD_GLOBAL_EL_PREFERENCE_MESSAGE); + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.resref.core; + +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalELReferenceWizardDialog extends ReferenceWizardDialog { + + public GlobalELReferenceWizardDialog(Shell parentShell, + Object fileLocation, ResourceReference resref, + ResourceReference[] resrefList) { + super(parentShell, new GlobalELReferenceWizard(fileLocation, + Messages.VRD_ADD_EL_PREFERENCE, resrefList), resref); + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalELReferenceWizardDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.resref.core; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Layout; +import org.jboss.tools.common.resref.core.ResourceReference; + +public class GlobalElReferenceWizardPage extends ELReferenceWizardPage { + + public GlobalElReferenceWizardPage(String pageName, String title, + ImageDescriptor titleImage, Object fileLocation) { + super(pageName, title, titleImage, fileLocation); + } + + @Override + protected Group createScopeGroup(Composite parent) { + Group groupControl = new Group(parent, SWT.SHADOW_ETCHED_IN); + groupControl.setText(Messages.SCOPE_GROUP_NAME); + Layout layout = new GridLayout(1, false); + groupControl.setLayout(layout); + + Button globalRadioButton = new Button(groupControl, SWT.RADIO); + globalRadioButton.setText(Messages.SCOPE_GLOBAL); + globalRadioButton.setSelection(true); + globalRadioButton.addSelectionListener(this); + + return groupControl; + } + + @Override + protected int getSelectedScope() { + return ResourceReference.GLOBAL_SCOPE; + } + + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalElReferenceWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,14 +1,13 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Red Hat, Inc. - initial API and implementation + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.vpe.resref.core; import org.jboss.tools.common.resref.core.ResourceReference; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -49,6 +49,8 @@ public static String SCOPE_FOLDER_SHORT; public static String SCOPE_PROJECT; public static String SCOPE_PROJECT_SHORT; + public static String SCOPE_GLOBAL; + public static String SCOPE_GLOBAL_SHORT; public static String WIZARD_PAGE_SHOULD_BE_INITIALIZED; @@ -65,6 +67,7 @@ public static String VRD_ADD_TAGLIB_PREFERENCE_MESSAGE; public static String VRD_ADD_EL_PREFERENCE; public static String VRD_ADD_EL_PREFERENCE_MESSAGE; + public static String ADD_GLOBAL_EL_PREFERENCE_MESSAGE; public static String VRD_PAGE_DESIGN_OPTIONS_ABOUT; public static String VRD_ACTUAL_RUN_TIME_FOLDERS_ABOUT; @@ -89,9 +92,11 @@ public static String URI_SHOULD_BE_SET; + public static String GLOBAL_EL_WIZARD_PAGE_NAME; public static String EL_WIZARD_PAGE_NAME; public static String EL_NAME; public static String EL_VALUE; + public static String EL_NAME_SHOULD_BE_SET; public static String INVALID_EL_EXPRESSION; public static String CANNOT_PARSE_SCOPE_VALUE; public static String EL_EXPRESSION_ALREADY_EXISTS; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.eclipse.jface.wizard.Wizard; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.eclipse.jface.dialogs.Dialog; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -43,11 +43,6 @@ this.fileLocation = fileLocation; setPageComplete(false); } - - public ReferenceWizardPage(String pageName) { - super(pageName); - setPageComplete(false); - } public static ImageDescriptor getImageDescriptor() { Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; public class TaglibReferenceWizard extends ReferenceWizard { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import org.eclipse.swt.widgets.Shell; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardPage.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.util.HashMap; @@ -10,7 +20,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; public class TaglibReferenceWizardPage extends ReferenceWizardPage { @@ -25,10 +34,6 @@ super(pageName, title, titleImage, fileLocation); } - public TaglibReferenceWizardPage(String pageName) { - super(pageName); - } - public void createControl(Composite parent) { Composite pageControl = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(2, false); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibResourceReferenceValidator.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.net.URI; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2009-08-20 12:12:24 UTC (rev 17183) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.vpe.resref.core; import java.io.IOException; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-20 09:51:23 UTC (rev 17182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-20 12:12:24 UTC (rev 17183) @@ -11,9 +11,11 @@ SCOPE_PAGE=Page: Only This Page SCOPE_FOLDER=Folder: Any Page at the Same Folder SCOPE_PROJECT=Project: Any Page at the Same Project +SCOPE_GLOBAL=Global: For all projects in workspace SCOPE_PAGE_SHORT=Page SCOPE_FOLDER_SHORT=Folder SCOPE_PROJECT_SHORT=Project +SCOPE_GLOBAL_SHORT=Global WIZARD_PAGE_SHOULD_BE_INITIALIZED=Reference wizard page should be initialized. # Runtime folders @@ -45,10 +47,11 @@ # El expression folder tab and dialog VRD_SUBSTITUTED_EL_EXPRESSIONS=Substituted EL expressions VRD_INVALID_EL_EXPRESSION=Invalid EL Expression. - VRD_SUBSTITUTED_EL_EXPRESSIONS_ABOUT=These EL expressions will be substituted by Visual Page Editor when generating a preview VRD_ADD_EL_PREFERENCE=Add EL Reference VRD_ADD_EL_PREFERENCE_MESSAGE=Add El variable, which will be substituted in a visual part for generating a preview +ADD_GLOBAL_EL_PREFERENCE_MESSAGE=Add global El variable, which will be substituted in a visual part for generating a preview +GLOBAL_EL_WIZARD_PAGE_NAME=Global EL Page EL_WIZARD_PAGE_NAME=EL Page EL_NAME=El Name* EL_VALUE=Value @@ -60,6 +63,7 @@ URI_SHOULD_BE_SET=URI should be set. # EL Validation +EL_NAME_SHOULD_BE_SET=EL Name should be set. INVALID_EL_EXPRESSION=Invalid EL expression. CANNOT_PARSE_SCOPE_VALUE=Cannot parse scope value EL_EXPRESSION_ALREADY_EXISTS=EL expression already exists in the selected scope.